BUGFIX

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004.java

@@ -125,13 +125,15 @@ public class ServiceHPKC004 extends ServiceBase {
 				newKc004.setDeleteFlag(CommonConstant.YesNo.YES_1);
 				DaoUtils.insert(HPKC004.INSERT, newKc004);
 				// 修改库存
-				if (hpkc010!=null)
+				if (hpkc010!=null) {
 					HPKCTools.updateStock(dbKc004.getWhCode(), hpkc010.getInventRecordId(),
-				dbKc004.getAmount(), dbKc004.getWeight().multiply(new BigDecimal(1000)),hpkc010.getFactoryCode());
-				else
+							dbKc004.getAmount(), dbKc004.getWeight(),hpkc010.getFactoryCode());
+				} else {
 					HPKCTools.updateProdStock(dbKc004.getWhCode(), dbKc004.getProdNo(),
 							dbKc004.getAmount(), dbKc004.getWeight(),hpkc011.getFactoryCode());
 				}
+
+			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC013.java

@@ -93,7 +93,7 @@ public class ServiceHPKC013 extends ServiceBase {
 				HPKC013 fKc013 = new HPKC013();
 				fKc013.fromMap(resultRows.get(i));
 				HPKC013 dbKc013 = mapKc013.get(fKc013.getReturnNo());
-				if (!fKc013.getSubInventCode().equals(" ")) {
+				if (!dbKc013.getSubInventCode().equals(" ")) {
 					hpkc011 = HPKCTools.HpKc011.listById(dbKc013.getKcId());
 				}else {
 					hpkc010 = HPKCTools.HpKc010.listById(dbKc013.getKcId());