解决自动拣货报空指针问题-张鑫0505

ic/src/private/nccloud/pubimpl/ic/pub/service/PickAutoServiceImpl.java

@@ -78,7 +78,6 @@ public class PickAutoServiceImpl implements IPickAutoService {
 
 	private BusiCalculator calc = BusiCalculator.getBusiCalculatorAtBS();
 
-
 	@Override
 	public Object autoPick(ICBillVO billvo, Map<String, Object> userObject) {
 		List<ICBillBodyVO> delbodys = this.processDelBody(new ICBillVO[] { billvo });
@@ -87,8 +86,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		ICBillVO retBillvo = (ICBillVO) billvo.clone();
 //		ICBillBodyVO[] bodyvos = retBillvo.getBodys();
 		this.preprocess(retBillvo);
-        OnhandResService resserver = NCLocator.getInstance().lookup(
+		OnhandResService resserver = NCLocator.getInstance().lookup(OnhandResService.class);
-                OnhandResService.class);
 		try {
 
 			// 预留处理
@@ -124,8 +122,10 @@ public class PickAutoServiceImpl implements IPickAutoService {
 					// 如果此行没有拣货数据，将此行直接放入新表体中
 					newBodyVOs.add(bodyvos[i]);
 					// zhengxinm 次行没有拣货数据 可能在预留时已经拣货 可能拣货成功但是表体备注有问题 这里检查下 如果没问题清空表体备注 2020-11-04
-                    if ((bodyvos[i].getNassistnum() != null ? bodyvos[i].getNassistnum() : new UFDouble(0)).doubleValue()
+					if ((bodyvos[i].getNassistnum() != null ? bodyvos[i].getNassistnum() : new UFDouble(0))
-                            ==(bodyvos[i].getNshouldassistnum() != null ? bodyvos[i].getNshouldassistnum() : new UFDouble(0)).doubleValue()) {
+							.doubleValue() == (bodyvos[i].getNshouldassistnum() != null
+									? bodyvos[i].getNshouldassistnum()
+									: new UFDouble(0)).doubleValue()) {
 						bodyvos[i].setVnotebody(null);
 					}
 					continue;
@@ -159,18 +159,15 @@ public class PickAutoServiceImpl implements IPickAutoService {
 			}
 			// 查询出来的对应入库单交易类型为编码，需要转换成主键再走模板翻译
 			this.translateCcorres(newBodyVOs);
-            retBillvo.setChildren(bodyvos[0].getClass(),
+			retBillvo.setChildren(bodyvos[0].getClass(), CollectionUtils.listToArray(newBodyVOs));
-                    CollectionUtils.listToArray(newBodyVOs));
 			this.setbodyNote(retBillvo, results);
 			// 同步表体批次辅助字段
-            new BatchSynchronizer(new ICBatchFields()).fillBatchVOtoBill(retBillvo
+			new BatchSynchronizer(new ICBatchFields()).fillBatchVOtoBill(retBillvo.getBodys());
-                    .getBodys());
 			// 处理供应商 客户vid字段
 			fireCvendoridEvent(retBillvo.getBodys());
 
 			// 同步表体序列号辅助字段
-            new SnCodeSynchronizer(new ICSnFields()).fillBatchVOtoBill(retBillvo
+			new SnCodeSynchronizer(new ICSnFields()).fillBatchVOtoBill(retBillvo.getBodys());
-                    .getBodys());
 			fireNumEditEvent(retBillvo, ICPubMetaNameConst.NNUM, newBodyVOs.get(0).getNnum(), -1, userObject);
 
 		} catch (BusinessException e) {
@@ -203,8 +200,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 	private void processNumInfo_End(ICBillBodyVO bodyvo, ICBillBodyVO origin, List<ICBillBodyVO> newBodyVOs) {
 		origin.setAttributeValue(ICPubMetaNameConst.NNUM, bodyvo.getNnum());
 		origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM, bodyvo.getNassistnum());
-        origin.setAttributeValue(ICPubMetaNameConst.NGROSSNUM,
+		origin.setAttributeValue(ICPubMetaNameConst.NGROSSNUM, bodyvo.getNgrossnum());
-                bodyvo.getNgrossnum());
 		// 计算前几行的应发数量合
 		UFDouble sumShouldNum = UFDouble.ZERO_DBL;
 		UFDouble sumShouldAssistNum = UFDouble.ZERO_DBL;
@@ -216,20 +212,19 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		}
 		// 78--2025年4月9日19点11分--sdlizheng--实发传输到应发，最后一行做合计处理--start
 		origin.setAttributeValue(ICPubMetaNameConst.NSHOULDNUM, MathTool.sub(bodyvo.getNshouldnum(), sumShouldNum));
-        origin.setAttributeValue(ICPubMetaNameConst.NSHOULDASSISTNUM, MathTool.sub(bodyvo.getNshouldassistnum(),sumShouldAssistNum));
+		origin.setAttributeValue(ICPubMetaNameConst.NSHOULDASSISTNUM,
+				MathTool.sub(bodyvo.getNshouldassistnum(), sumShouldAssistNum));
 		// 78--2025年4月9日19点11分--sdlizheng--实发传输到应发，最后一行做合计处理--start
 
 		UFDouble shouldnum = origin.getNshouldnum();
 		UFDouble shouldastnum = origin.getNshouldassistnum();
 		UFDouble num = origin.getNnum();
-        if (NCBaseTypeUtils.isNullOrZero(shouldnum)
+		if (NCBaseTypeUtils.isNullOrZero(shouldnum) && NCBaseTypeUtils.isNullOrZero(shouldastnum)
-                && NCBaseTypeUtils.isNullOrZero(shouldastnum)
 				&& NCBaseTypeUtils.isNullOrZero(num)) {
 			return;
 		}
 
-        InvCalBodyVO calbodyvo = invInfoMap.get(origin.getCmaterialvid())
+		InvCalBodyVO calbodyvo = invInfoMap.get(origin.getCmaterialvid()).getInvcalbodyvo();
-                .getInvcalbodyvo();
 
 		// 清空辅数量，避免辅数量是拣货前数量，影响联动计算
 		origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM, null);
@@ -237,11 +232,9 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		if (ValueCheckUtil.isTrue(calbodyvo.getSerialmanaflag())) {
 			origin.setAttributeValue(ICPubMetaNameConst.NNUM, bodyvo.getNnum());
 //			this.caculateAfterNumEdit(bodyvo);
-            origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM,
+			origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM, bodyvo.getNassistnum());
-                    bodyvo.getNassistnum());
+			boolean isNullServialcode = StringUtil.isSEmptyOrNullForAll(
-            boolean isNullServialcode = StringUtil.isSEmptyOrNullForAll(VOEntityUtil
+					VOEntityUtil.getVOsValuesNotDel(bodyvo.getLocationVOs(), ICLocationVO.VSERIALCODE, String.class));
-                    .getVOsValuesNotDel(bodyvo.getLocationVOs(),
-                            ICLocationVO.VSERIALCODE, String.class));
 			if (bodyvo.getLocationVOs() != null && isNullServialcode) {
 				this.processLocAstNum(bodyvo);
 			}
@@ -283,15 +276,13 @@ public class PickAutoServiceImpl implements IPickAutoService {
 //		this.caculateAfterNumEdit(bodyvo);
 		// 对于辅计量记结存的物料，计算辅数量之后，会导致界面展示和结存数据不一致，所以用结存数据设置
 		if (!ValueCheckUtil.isNullORZeroLength(this.isasunitstore)) {
-            if (ValueCheckUtil.isTrue(this.isasunitstore.get((String) origin
+			if (ValueCheckUtil
-                    .getAttributeValue(ICPubMetaNameConst.CMATERIALVID)
+					.isTrue(this.isasunitstore.get((String) origin.getAttributeValue(ICPubMetaNameConst.CMATERIALVID)
 							+ (String) origin.getAttributeValue(ICPubMetaNameConst.CASTUNITID)))) {
-                origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM,
+				origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM, bodyvo.getNassistnum());
-                        bodyvo.getNassistnum());
 			} else {
 				bodyvo.setNassistnum(calc.calculateAstNum(bodyvo.getNnum(),
-                        (String) origin.getAttributeValue(ICPubMetaNameConst.VCHANGERATE),
+						(String) origin.getAttributeValue(ICPubMetaNameConst.VCHANGERATE), bodyvo.getCasscustid()));
-                        bodyvo.getCasscustid()));
 			}
 		}
 
@@ -303,6 +294,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 
 	/**
 	 * 查询出来的对应入库单交易类型为编码，需要转换成主键再走模板翻译
+	 * 
 	 * @param newBodyVOs
 	 */
 	private void translateCcorres(List<ICBillBodyVO> newBodyVOs) {
@@ -332,7 +324,6 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		}
 	}
 
-
 	private void fireCvendoridEvent(ICBillBodyVO[] bodys) {
 		if (bodys == null || bodys.length == 0) {
 			return;
@@ -383,7 +374,8 @@ public class PickAutoServiceImpl implements IPickAutoService {
 				casscustidAndDate.put(casscustid, busidate);
 			}
 			// 根据客户oid和业务日期查询vid
-            casscustidMap = (HashMap<String, String>) CustomerPubService.queryCustomerVidsByOidsAndDate(casscustidAndDate);
+			casscustidMap = (HashMap<String, String>) CustomerPubService
+					.queryCustomerVidsByOidsAndDate(casscustidAndDate);
 		}
 		if (ctplcustomeridset != null && ctplcustomeridset.size() > 0) {
 			for (String ctplcustomerid : ctplcustomeridset) {
@@ -441,8 +433,8 @@ public class PickAutoServiceImpl implements IPickAutoService {
 	 * @param newnum
 	 * @param oldnum
 	 */
-    private void fireNumEditEvent(ICBillVO billvo, String numField,
+	private void fireNumEditEvent(ICBillVO billvo, String numField, UFDouble num, int index,
-                                  UFDouble num, int index, Map<String,Object> userObject) {
+			Map<String, Object> userObject) {
 		// 获取拣货后的billvo的实发数量存放到数量编辑后事件之后的新vo里
 		Map<String, UFDouble> nassistnumMap = new HashMap<>();
 		Map<String, UFDouble> nnumMap = new HashMap<>();
@@ -461,16 +453,16 @@ public class PickAutoServiceImpl implements IPickAutoService {
 			nnumMap.put(crowno, nnum);
 		}
 
-        BillCardBodyChangedRow changedRow = new BillCardBodyChangedRow(num,
+		BillCardBodyChangedRow changedRow = new BillCardBodyChangedRow(num, null, null);
-                null, null);
+		BillCardBodyEditEvent event = new BillCardBodyEditEvent(numField, index,
-        BillCardBodyEditEvent event = new BillCardBodyEditEvent(numField,
+				new BillCardBodyChangedRow[] { changedRow }, null);
-                index, new BillCardBodyChangedRow[] { changedRow }, null);
 		new NumEventRule().afterEdit(billvo, event, userObject);
 
 		CircularlyAccessibleValueObject[] newBodys = billvo.getAllChildrenVO();
 		for (CircularlyAccessibleValueObject body : newBodys) {
 			if (nassistnumMap.get(body.getAttributeValue(MetaNameConst.CROWNO)) != null) {
-                body.setAttributeValue(MetaNameConst.NASSISTNUM, nassistnumMap.get(body.getAttributeValue(MetaNameConst.CROWNO)));
+				body.setAttributeValue(MetaNameConst.NASSISTNUM,
+						nassistnumMap.get(body.getAttributeValue(MetaNameConst.CROWNO)));
 			}
 			if (nnumMap.get(body.getAttributeValue(MetaNameConst.CROWNO)) != null) {
 				body.setAttributeValue(MetaNameConst.NNUM, nnumMap.get(body.getAttributeValue(MetaNameConst.CROWNO)));
@@ -494,7 +486,6 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		String errMsg = OnhandRes.getOnhandErro();
 		Set<String> origRowNo = new HashSet<String>();
 
-
 		int realIndex = 0;
 		int pickIndex = 1;// 拣货下标
 		for (int i = 0, loop = uiBodys.length; i < loop; i++) {
@@ -512,7 +503,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 			String crowno = uibody.getCrowno();
 			for (ICBillBodyVO body : bodys) {
 				// 防止多次计算，添加货位判断，同一行表体拣货拆分行后，表体行和拣货行货位相同--sdlizheng start
-                if(body.getClocationid().equals(uibody.getClocationid())){
+				if (body.getClocationid() == null || body.getClocationid().equals(uibody.getClocationid())) {
 					UFDouble nnum = body.getNnum();
 					nshouldnum = nshouldnum.sub(nnum);
 				}
@@ -532,8 +523,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 			// sdlizheng --因为拣货拆行，获取pickbodys时的下标row需要循环完此次已拣货的行数之后加1--end
 		}
 		for (int i = 0; i < uiBodys.length; i++) {
-            String rowno = (String) uiBodys[i]
+			String rowno = (String) uiBodys[i].getAttributeValue(ICPubMetaNameConst.CROWNO);
-                    .getAttributeValue(ICPubMetaNameConst.CROWNO);
 			if (origRowNo.contains(rowno)) {
 				uiBodys[i].setAttributeValue(ICPubMetaNameConst.VNOTEBODY, errMsg);
 			}
@@ -557,10 +547,9 @@ public class PickAutoServiceImpl implements IPickAutoService {
 	}
 
 	private void clearExtendTableData(ICBillBodyVO tempBodyvo) {
-        String[] extendTableField = new String[] { "naccumvminum",
+		String[] extendTableField = new String[] { "naccumvminum", "ncorrespondgrsnum", "ncorrespondastnum",
-                "ncorrespondgrsnum", "ncorrespondastnum", "ncorrespondnum",
+				"ncorrespondnum", "naccumoutsignnum", "naccumoutbacknum", "nrushnum", "nsignnum", "ntotaltrannum",
-                "naccumoutsignnum", "naccumoutbacknum", "nrushnum", "nsignnum",
+				"btranendflag", "naccumwastnum", "csumid" };
-                "ntotaltrannum", "btranendflag", "naccumwastnum", "csumid" };
 		for (String field : extendTableField) {
 			tempBodyvo.setAttributeValue(field, null);
 		}
@@ -589,8 +578,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		if (!SysInitGroupQuery.isSNEnabled()) {
 			return;
 		}
-        UFDouble nassistnum = (UFDouble) origin
+		UFDouble nassistnum = (UFDouble) origin.getAttributeValue(ICPubMetaNameConst.NASSISTNUM);
-                .getAttributeValue(ICPubMetaNameConst.NASSISTNUM);
 		// 只有表体数量为1时才设置表体值
 		if (!NCBaseTypeUtils.isEquals(nassistnum, UFDouble.ONE_DBL)) {
 			return;
@@ -613,18 +601,15 @@ public class PickAutoServiceImpl implements IPickAutoService {
 					&& StringUtil.isNullStringOrNull(lvo.getPk_serialcode())) {
 				return;
 			}
-            origin.setAttributeValue(ICPubMetaNameConst.VSERIALCODE,
+			origin.setAttributeValue(ICPubMetaNameConst.VSERIALCODE, lvos[0].getVserialcode());
-                    lvos[0].getVserialcode());
+			origin.setAttributeValue(ICPubMetaNameConst.PK_SERIALCODE, lvos[0].getPk_serialcode());
-            origin.setAttributeValue(ICPubMetaNameConst.PK_SERIALCODE,
-                    lvos[0].getPk_serialcode());
 		}
 	}
 
 	private void processNumInfo(ICBillBodyVO bodyvo, ICBillBodyVO origin) {
 		origin.setAttributeValue(ICPubMetaNameConst.NNUM, bodyvo.getNnum());
 		origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM, bodyvo.getNassistnum());
-        origin.setAttributeValue(ICPubMetaNameConst.NGROSSNUM,
+		origin.setAttributeValue(ICPubMetaNameConst.NGROSSNUM, bodyvo.getNgrossnum());
-                bodyvo.getNgrossnum());
 		// 78--2025年4月9日19点11分--sdlizheng--实发传输到应发，最后一行做合计处理--start
 		origin.setAttributeValue(ICPubMetaNameConst.NSHOULDNUM, bodyvo.getNnum());
 		origin.setAttributeValue(ICPubMetaNameConst.NSHOULDASSISTNUM, bodyvo.getNassistnum());
@@ -633,14 +618,12 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		UFDouble shouldnum = origin.getNshouldnum();
 		UFDouble shouldastnum = origin.getNshouldassistnum();
 		UFDouble num = origin.getNnum();
-        if (NCBaseTypeUtils.isNullOrZero(shouldnum)
+		if (NCBaseTypeUtils.isNullOrZero(shouldnum) && NCBaseTypeUtils.isNullOrZero(shouldastnum)
-                && NCBaseTypeUtils.isNullOrZero(shouldastnum)
 				&& NCBaseTypeUtils.isNullOrZero(num)) {
 			return;
 		}
 
-        InvCalBodyVO calbodyvo = invInfoMap.get(origin.getCmaterialvid())
+		InvCalBodyVO calbodyvo = invInfoMap.get(origin.getCmaterialvid()).getInvcalbodyvo();
-                .getInvcalbodyvo();
 
 		// 清空辅数量，避免辅数量是拣货前数量，影响联动计算
 		origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM, null);
@@ -648,11 +631,9 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		if (ValueCheckUtil.isTrue(calbodyvo.getSerialmanaflag())) {
 			origin.setAttributeValue(ICPubMetaNameConst.NNUM, bodyvo.getNnum());
 //			this.caculateAfterNumEdit(bodyvo);
-            origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM,
+			origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM, bodyvo.getNassistnum());
-                    bodyvo.getNassistnum());
+			boolean isNullServialcode = StringUtil.isSEmptyOrNullForAll(
-            boolean isNullServialcode = StringUtil.isSEmptyOrNullForAll(VOEntityUtil
+					VOEntityUtil.getVOsValuesNotDel(bodyvo.getLocationVOs(), ICLocationVO.VSERIALCODE, String.class));
-                    .getVOsValuesNotDel(bodyvo.getLocationVOs(),
-                            ICLocationVO.VSERIALCODE, String.class));
 			if (bodyvo.getLocationVOs() != null && isNullServialcode) {
 				this.processLocAstNum(bodyvo);
 			}
@@ -694,15 +675,13 @@ public class PickAutoServiceImpl implements IPickAutoService {
 //		this.caculateAfterNumEdit(bodyvo);
 		// 对于辅计量记结存的物料，计算辅数量之后，会导致界面展示和结存数据不一致，所以用结存数据设置
 		if (!ValueCheckUtil.isNullORZeroLength(this.isasunitstore)) {
-            if (ValueCheckUtil.isTrue(this.isasunitstore.get((String) origin
+			if (ValueCheckUtil
-                    .getAttributeValue(ICPubMetaNameConst.CMATERIALVID)
+					.isTrue(this.isasunitstore.get((String) origin.getAttributeValue(ICPubMetaNameConst.CMATERIALVID)
 							+ (String) origin.getAttributeValue(ICPubMetaNameConst.CASTUNITID)))) {
-                origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM,
+				origin.setAttributeValue(ICPubMetaNameConst.NASSISTNUM, bodyvo.getNassistnum());
-                        bodyvo.getNassistnum());
 			} else {
 				bodyvo.setNassistnum(calc.calculateAstNum(bodyvo.getNnum(),
-                        (String) origin.getAttributeValue(ICPubMetaNameConst.VCHANGERATE),
+						(String) origin.getAttributeValue(ICPubMetaNameConst.VCHANGERATE), bodyvo.getCasscustid()));
-                        bodyvo.getCasscustid()));
 			}
 		}
 
@@ -712,8 +691,6 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		}
 	}
 
-
-
 	/**
 	 * 处理货位信息的辅数量，进行重新计算，并处理尾差，解决存量不足时货位单品信息数量错误的问题。
 	 *
@@ -731,8 +708,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		UFDouble nassistnum = UFDouble.ZERO_DBL;
 		for (int i = 0; i < locs.length - 1; i++) {
 			// 此处无论是否单品管理，都需要处理辅数量，否则有货位信息时，更新存量会有问题
-            nassistnum = calc.calculateAstNum(locs[i].getNnum(),
+			nassistnum = calc.calculateAstNum(locs[i].getNnum(), body.getVchangerate(), body.getCastunitid());
-                    body.getVchangerate(), body.getCastunitid());
 
 			locs[i].setNassistnum(nassistnum);
 			nsum = NCBaseTypeUtils.add(nsum, nassistnum);
@@ -745,14 +721,11 @@ public class PickAutoServiceImpl implements IPickAutoService {
 	}
 
 	private void processCcorrespondInfo(ICBillBodyVO bodyvo, ICBillBodyVO origin) {
-        String[] corresponds = new String[] { MetaNameConst.CCORRESPONDTYPE,
+		String[] corresponds = new String[] { MetaNameConst.CCORRESPONDTYPE, MetaNameConst.CCORRESPONDTRANSTYPE,
-                MetaNameConst.CCORRESPONDTRANSTYPE, MetaNameConst.CCORRESPONDCODE,
+				MetaNameConst.CCORRESPONDCODE, MetaNameConst.CCORRESPONDHID, MetaNameConst.CCORRESPONDBID,
-                MetaNameConst.CCORRESPONDHID, MetaNameConst.CCORRESPONDBID,
+				MetaNameConst.CCORRESPONDROWNO, ICPubMetaNameConst.CROWNO, ICPubMetaNameConst.NCOSTMNY,
-                MetaNameConst.CCORRESPONDROWNO, ICPubMetaNameConst.CROWNO,
+				ICPubMetaNameConst.NPLANNEDMNY, MetaNameConst.DBIZDATE, ICPubMetaNameConst.VNOTEBODY };
-                ICPubMetaNameConst.NCOSTMNY, ICPubMetaNameConst.NPLANNEDMNY,
+		String cmateiralvid = (String) origin.getAttributeValue(ICPubMetaNameConst.CMATERIALVID);
-                MetaNameConst.DBIZDATE, ICPubMetaNameConst.VNOTEBODY };
-        String cmateiralvid = (String) origin
-                .getAttributeValue(ICPubMetaNameConst.CMATERIALVID);
 		InvCalBodyVO invvo = this.invInfoMap.get(cmateiralvid).getInvcalbodyvo();
 		// 对于非出入库跟踪物料，不处理对应入库单信息，否则会把原始信息清掉（出库参照入库单拉单）
 		if (invvo == null || !ValueCheckUtil.isTrue(invvo.getOuttrackin())) {
@@ -767,8 +740,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 	 * 重新设置表体货位ID，如果单品信息分布在多个货位，清空表体，否则，设置单品货位信息到表体
 	 *
 	 * @param bodyvo拣货结果
-     * @param row
+	 * @param row        µ±Ç°ÐÐ
-     *          µ±Ç°ÐÐ
 	 */
 	private void resetBodyLocationID(ICBillBodyVO bodyvo, ICBillBodyVO origin) {
 		ICLocationVO[] locs = bodyvo.getLocationVOs();
@@ -777,8 +749,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 			return;
 		}
 
-        List<String> locids = VOEntityUtil.getVOsValueListNotDel(locs,
+		List<String> locids = VOEntityUtil.getVOsValueListNotDel(locs, ICLocationVO.CLOCATIONID);
-                ICLocationVO.CLOCATIONID);
 		if (ValueCheckUtil.isNullORZeroLength(locids)) {
 			return;
 		}
@@ -804,33 +775,26 @@ public class PickAutoServiceImpl implements IPickAutoService {
 				continue;
 			}
 			// 拣出的货非换算率记结存场合，不包含换算率信息
-            if (field.equals(OnhandDimVO.VCHANGERATE)
+			if (field.equals(OnhandDimVO.VCHANGERATE) && StringUtil.isSEmptyOrNull(bodyvo.getVchangerate())) {
-                    && StringUtil.isSEmptyOrNull(bodyvo.getVchangerate())) {
 				continue;
 			}
 			// 固定辅助属性(库存状态、项目、供应商、生产厂商、客户)
-            if (field.equals(OnhandDimVO.CSTATEID)
+			if (field.equals(OnhandDimVO.CSTATEID) && StringUtil.isSEmptyOrNull(bodyvo.getCstateid())) {
-                    && StringUtil.isSEmptyOrNull(bodyvo.getCstateid())) {
 				continue;
 			}
-            if (field.equals(OnhandDimVO.CPROJECTID)
+			if (field.equals(OnhandDimVO.CPROJECTID) && StringUtil.isSEmptyOrNull(bodyvo.getCprojectid())) {
-                    && StringUtil.isSEmptyOrNull(bodyvo.getCprojectid())) {
 				continue;
 			}
-            if (field.equals(OnhandDimVO.CVENDORID)
+			if (field.equals(OnhandDimVO.CVENDORID) && StringUtil.isSEmptyOrNull(bodyvo.getCvendorid())) {
-                    && StringUtil.isSEmptyOrNull(bodyvo.getCvendorid())) {
 				continue;
 			}
-            if (field.equals(OnhandDimVO.CPRODUCTORID)
+			if (field.equals(OnhandDimVO.CPRODUCTORID) && StringUtil.isSEmptyOrNull(bodyvo.getCproductorid())) {
-                    && StringUtil.isSEmptyOrNull(bodyvo.getCproductorid())) {
 				continue;
 			}
-            if (field.equals(OnhandDimVO.CASSCUSTID)
+			if (field.equals(OnhandDimVO.CASSCUSTID) && StringUtil.isSEmptyOrNull(bodyvo.getCasscustid())) {
-                    && StringUtil.isSEmptyOrNull(bodyvo.getCasscustid())) {
 				continue;
 			}
-            if (field.equals(OnhandDimVO.CFFILEID)
+			if (field.equals(OnhandDimVO.CFFILEID) && StringUtil.isSEmptyOrNull(bodyvo.getCffileid())) {
-                    && StringUtil.isSEmptyOrNull(bodyvo.getCffileid())) {
 				continue;
 			}
 			origin.setAttributeValue(field, bodyvo.getAttributeValue(field));
@@ -873,7 +837,8 @@ public class PickAutoServiceImpl implements IPickAutoService {
 //		}
 		IMarAssistantPubService assistantPubService = NCLocator.getInstance().lookup(IMarAssistantPubService.class);
 		try {
-            UserdefitemVO[] userdefitemVOs = assistantPubService.queryMarAssistantDefine(AppContext.getInstance().getPkGroup());
+			UserdefitemVO[] userdefitemVOs = assistantPubService
+					.queryMarAssistantDefine(AppContext.getInstance().getPkGroup());
 			boolean isUseDef = false;
 			if (userdefitemVOs != null) {
 				for (UserdefitemVO vo : userdefitemVOs) {
@@ -889,8 +854,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 			ExceptionUtils.wrappException(e);
 		}
 		// 统一处理变动换算率格式，否则与结存的换算率格式不匹配
-        new ICBillValueSetter().procChangeRateFormat(new ICBillVO[] { billvo },
+		new ICBillValueSetter().procChangeRateFormat(new ICBillVO[] { billvo }, new ICBSContext().getInvInfo());
-                new ICBSContext().getInvInfo());
 	}
 
 	/**
@@ -950,6 +914,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		}
 		return materialMapList;
 	}
+
 	private Map<String, List<Integer>> getMarFrameMap(Map<String, MaterialVO> materialMap) {
 		Map<String, List<Integer>> marFrameMap = null;
 		try {
@@ -960,14 +925,14 @@ public class PickAutoServiceImpl implements IPickAutoService {
 					marFramePkSet.add(pk_marasstframe);
 				}
 			}
-            marFrameMap =
+			marFrameMap = MarAssistantCheckUtils
-                    MarAssistantCheckUtils.queryMarAsstFrameIncludeDefPropIndex(marFramePkSet
+					.queryMarAsstFrameIncludeDefPropIndex(marFramePkSet.toArray(new String[0]));
-                            .toArray(new String[0]));
 		} catch (BusinessException e) {
 			ExceptionUtils.wrappException(e);
 		}
 		return marFrameMap;
 	}
+
 	private Map<String, MaterialVO> getMaterialMap(String materialField, ISuperVO[] valueObjects) {
 		Map<String, MaterialVO> materialMap = null;
 		try {
@@ -977,11 +942,9 @@ public class PickAutoServiceImpl implements IPickAutoService {
 				marPkSet.add(pk_material);
 			}
 
-            IMaterialPubService_C marService =
+			IMaterialPubService_C marService = NCLocator.getInstance().lookup(IMaterialPubService_C.class);
-                    NCLocator.getInstance().lookup(IMaterialPubService_C.class);
+			materialMap = marService.queryMaterialBaseInfoByPks(marPkSet.toArray(new String[0]),
-            materialMap =
+					new String[] { MaterialVO.PK_MARASSTFRAME, MaterialVO.NAME, MaterialVO.NAME2, MaterialVO.NAME3,
-                    marService.queryMaterialBaseInfoByPks(marPkSet.toArray(new String[0]), new String[] {
-                            MaterialVO.PK_MARASSTFRAME, MaterialVO.NAME, MaterialVO.NAME2, MaterialVO.NAME3,
 							MaterialVO.NAME4, MaterialVO.NAME5, MaterialVO.NAME6 });
 		} catch (BusinessException e) {
 			ExceptionUtils.wrappException(e);
@@ -989,26 +952,21 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		return materialMap;
 	}
 
-
-
 	/**
 	 * 没有拣到存量的行，设置表体备注“现存量不足”
 	 *
 	 * @param uiBodys
 	 * @param results
 	 */
-    private void setBodyNoteOnhandErro(ICBillBodyVO[] uiBodys,
+	private void setBodyNoteOnhandErro(ICBillBodyVO[] uiBodys, ICBillPickResults results) {
-                                       ICBillPickResults results) {
 		String errMsg = OnhandRes.getOnhandErro();
 		if (results == null) {
 			for (int i = 0, loop = uiBodys.length; i < loop; i++) {
 
-                if (null == uiBodys[i]
+				if (null == uiBodys[i].getAttributeValue(ICPubMetaNameConst.CMATERIALVID)) {
-                        .getAttributeValue(ICPubMetaNameConst.CMATERIALVID)) {
 					continue;
 				}
-                if (!NCBaseTypeUtils.isNullOrZero((UFDouble) uiBodys[i]
+				if (!NCBaseTypeUtils.isNullOrZero((UFDouble) uiBodys[i].getAttributeValue(ICPubMetaNameConst.NNUM))) {
-                        .getAttributeValue(ICPubMetaNameConst.NNUM))) {
 					continue;
 				}
 				uiBodys[i].setAttributeValue(ICPubMetaNameConst.VNOTEBODY, errMsg);
@@ -1026,8 +984,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 			if (null == uiBodys[i].getAttributeValue(ICPubMetaNameConst.CMATERIALVID)) {
 				continue;
 			}
-            if (!NCBaseTypeUtils.isNullOrZero((UFDouble) uiBodys[i]
+			if (!NCBaseTypeUtils.isNullOrZero((UFDouble) uiBodys[i].getAttributeValue(ICPubMetaNameConst.NNUM))) {
-                    .getAttributeValue(ICPubMetaNameConst.NNUM))) {
 				continue;
 			}
 			uiBodys[i].setAttributeValue(ICPubMetaNameConst.VNOTEBODY, errMsg);
@@ -1036,13 +993,11 @@ public class PickAutoServiceImpl implements IPickAutoService {
 	}
 
 	private void loadInvCalBodyInfo(ICBillVO billvo) {
-        String pk_org = (String) billvo.getHead().getAttributeValue(
+		String pk_org = (String) billvo.getHead().getAttributeValue(ICPubMetaNameConst.PK_ORG);
-                ICPubMetaNameConst.PK_ORG);
 		ICBillBodyVO[] uiBodys = billvo.getBodys();
 		Set<String> invpks = new HashSet<String>();
 		for (int i = 0; i < uiBodys.length; i++) {
-            String cmaterialvid = (String) uiBodys[i]
+			String cmaterialvid = (String) uiBodys[i].getAttributeValue(ICPubMetaNameConst.CMATERIALVID);
-                    .getAttributeValue(ICPubMetaNameConst.CMATERIALVID);
 			if (StringUtil.isSEmptyOrNull(cmaterialvid)) {
 				continue;
 			}
@@ -1052,8 +1007,8 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		if (invpks.size() == 0) {
 			return;
 		}
-        InvBasAndCalInfo[] invInfos = new ICBSContext().getInvInfo()
+		InvBasAndCalInfo[] invInfos = new ICBSContext().getInvInfo().getInvBasAndCalInfo(pk_org,
-                .getInvBasAndCalInfo(pk_org, invpks.toArray(new String[0]));
+				invpks.toArray(new String[0]));
 		if (invInfos == null || invInfos.length == 0) {
 			return;
 		}
@@ -1062,8 +1017,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		this.invInfoMap = this.setInvBasInfosToMap(invInfos);
 	}
 
-    private Map<String, InvBasAndCalInfo> setInvBasInfosToMap(
+	private Map<String, InvBasAndCalInfo> setInvBasInfosToMap(InvBasAndCalInfo[] invInfos) {
-            InvBasAndCalInfo[] invInfos) {
 		Map<String, InvBasAndCalInfo> infoMap = new HashMap<String, InvBasAndCalInfo>();
 		for (InvBasAndCalInfo info : invInfos) {
 			// BUG:如果没有分配到库存组织，就跳过，否则会报错
@@ -1088,13 +1042,11 @@ public class PickAutoServiceImpl implements IPickAutoService {
 		List<String> invpks = new ArrayList<String>();
 		List<String> measpks = new ArrayList<String>();
 		for (int i = 0; i < bodyvos.length; i++) {
-            String invpk = (String) bodyvos[i]
+			String invpk = (String) bodyvos[i].getAttributeValue(ICPubMetaNameConst.CMATERIALVID);
-                    .getAttributeValue(ICPubMetaNameConst.CMATERIALVID);
 			if (StringUtil.isSEmptyOrNull(invpk)) {
 				continue;
 			}
-            String measpk = (String) bodyvos[i]
+			String measpk = (String) bodyvos[i].getAttributeValue(ICPubMetaNameConst.CASTUNITID);
-                    .getAttributeValue(ICPubMetaNameConst.CASTUNITID);
 			;
 			if (StringUtil.isSEmptyOrNull(measpk)) {
 				continue;
@@ -1107,8 +1059,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 			}
 
 		}
-        InvMeasVO[] invmeasvos = new ICBSContext().getInvInfo().getInvMeasVO(
+		InvMeasVO[] invmeasvos = new ICBSContext().getInvInfo().getInvMeasVO(invpks.toArray(new String[invpks.size()]),
-                invpks.toArray(new String[invpks.size()]),
 				measpks.toArray(new String[measpks.size()]));
 		Map<String, UFBoolean> bastunitstore = new HashMap<String, UFBoolean>();
 		if (invmeasvos != null) {
@@ -1127,6 +1078,7 @@ public class PickAutoServiceImpl implements IPickAutoService {
 
 	/**
 	 * 同步序列号档案上信息到孙表
+	 * 
 	 * @param billvo
 	 * @param results
 	 *

ic/src/public/nccloud/openapi/ic/util/ICAPILocationVOUtils.java

@@ -177,6 +177,8 @@ public class ICAPILocationVOUtils {
                         }
 
                         lvo.setClocationid(rackvo.getPk_rack());
+                        
+                        bodyvo.setClocationid(rackvo.getPk_rack());
                     }
                     // ÉèÖÃÐòÁкÅÖ÷¼ü
                     String vserialcode = lvo.getVserialcode();