代码合并修改/增加产品存货代码逻辑

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

@@ -88,10 +88,15 @@ public class ServiceHPKC003 extends ServiceBase {
 				fKc003.setInventName(HPPZTools.getPz004ByCode(fKc003.getInventCode()).getInventName());
 				// 生成入库单号
 				fKc003.setProdNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC003_PROD_NO));
+
+//				fKc003.setPrdtCode(HPPZTools.checkAndSavePZ04(fKc003.getPrdtType(),fKc003.getPrdtName()));
+//				fKc003.setPartCode(HPPZTools.checkAndSavePZ04(fKc003.getPartType(),fKc003.getPartName()));
+
 				DaoUtils.insert("HPKC003.insert", fKc003);
 
 				//同步生产计划
 				DaoUtils.update("HPSC004.update",this.synchronousPlan(fKc003));
+
 				// 修改库存
 				HPKCTools.updateStock(fKc003.getWhCode(), fKc003.getInventRecordId(), fKc003.getAmount(),
 						fKc003.getWeight());

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java

@@ -83,6 +83,7 @@ public class ServiceHPSC002 extends ServiceBase {
                 BigDecimal totalWt = new BigDecimal(decimalFormat.format(Math.round(num.multiply(unitWt).floatValue())));
                 hppz002.setDelStatus(CommonConstant.YesNo.NO_0.intValue());
                 hppz002.setTotalWt(totalWt);
+
 //                if (StringUtils.isNotEmpty(hppz002.getPrdtCode()) && !hppz002.getParentId().equals("root")) {
 //                    hppz002.setPrdtName(HPPZTools.getPz004ByCode(hppz002.getPrdtCode()).getInventName());
 //                }
@@ -90,6 +91,7 @@ public class ServiceHPSC002 extends ServiceBase {
                 if(hppz002.getParentId().equals("root")){
                     hppz002.setLv(new Integer(1));
                 }else{
+                    hppz002.setPrdtCode(HPPZTools.checkAndSavePZ04(hppz002.getPrdtType(),hppz002.getPrdtName()));
                     Integer lv = (Integer) this.dao.get("HPSC002.queryLv","id",hppz002.getParentId());
                     hppz002.setLv(lv.intValue()+1);
                 }