备料计划下达优化

mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmCheckIsToAction.java

@@ -153,16 +153,18 @@ public class PickmCheckIsToAction implements ICommonAction {
                         // 有物料类型时的判断
                         String sql = "SELECT bd_defdoc.code FROM bd_defdoc where bd_defdoc.pk_defdoc = '" + materalType + "'";
                         String bomcode = (String) dao.executeQuery(sql, new ColumnProcessor());
+//                        1	制造件
+//                        2	采购件
 
                         // 根据订单类型判断不符合条件
                         if ("1".equals(type)) {
                             // 请购单：采购件或未知类型不符合
-                            if (null == bomcode || "2".equals(bomcode) || "".equals(bomcode)) {
+                            if (null == bomcode || "1".equals(bomcode) || "".equals(bomcode)) {
                                 isValid = false;
                             }
                         } else if ("2".equals(type)) {
                             // 生产订单：可能有不同的判断标准
-                            if (null == bomcode || "2".equals(bomcode) || "3".equals(bomcode) || "".equals(bomcode)) {
+                            if (null == bomcode || "1".equals(bomcode)|| "".equals(bomcode)) {
                                 isValid = false;
                             }
                         }

mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java

@@ -83,7 +83,7 @@ public class PickmToBuyingreqAction implements ICommonAction {
                     PraybillItemVO praybillItemVO=(PraybillItemVO)  prayVO.getChildrenVO()[j];
                     ((PraybillItemVO) prayVO.getChildrenVO()[j]).setCrowno(String.valueOf(j*10+10));
                     map.put("num",praybillItemVO.getNastnum());
-                    map.put("pk",praybillItemVO.getCfirstbid());
+                    map.put("pk",praybillItemVO.getCsourcebid());
                     updateList.add(map);
                 }
 

mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java

@@ -190,6 +190,9 @@ public class PickmToPmo implements ICommonAction {
                             if(ritem.getVrowno().equals(aggPickmVO.getParentVO().getVsourcebillrowno())){
                                 itemVO.setTplanendtime(ritem.getTplanendtime());
                             }
+
+
+
                         }
                     }
                 }
@@ -198,6 +201,12 @@ public class PickmToPmo implements ICommonAction {
                             "cprojectid = '"+itemVO.getCprojectid()+"' AND cmaterialid= '"+itemVO.getCmaterialvid()+"' AND dr = '0' AND pk_org= '"+head.getPk_org()+"'");
                     itemVO.setCbomversionid(cbomid);
                 }
+//                查询物料库存页签的生产部门赋值生产订单
+                String cdeptid = getValueByCondtion("bd_materialprod", "  pk_prodeptdoc ", "  pk_material= '"+itemVO.getCmaterialvid()+"' and pk_org = '"
+                        + head.getPk_org() + "' and dr = 0 ");
+                itemVO.setCdeptid(cdeptid);
+                String cdeptvid = getValueByCondtion("org_dept_v", "  pk_vid ", "  pk_dept= '"+cdeptid+"'  and dr = 0 ");
+                itemVO.setCdeptvid(cdeptvid);
             }
         }
         List<PMOAggVO> resultList = new ArrayList<>();

mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java

@@ -92,6 +92,7 @@ public class AfterApproveSyncHighpressureMesRule implements IRule<PMOAggVO> {
                 Object contractNum = hybo.findColValue("bd_defdoc", "code", " (pk_defdoclist = '" + o + "' and pk_defdoc='" + item.getVdef1() + "') ");
 
                 itemObj.put("contractNum", contractNum); // ºÏͬ±àºÅ
+                itemObj.put("cwarehouseid", item.getAttributeValue("vbdef35")); // ｺﾏﾍｬｱ犲ﾅ
                 Object pk_project = hybo.findColValue("bd_project", "project_name", " pk_project = '" + item.getCprojectid() + "' ");
 
                 itemObj.put("entryName", pk_project); // ÏîÄ¿Ãû³Æ

pu/src/private/nc/bs/pu/m20/maintain/rule/delete/UpdatePickmRule.java

@@ -43,7 +43,7 @@ public class UpdatePickmRule implements IRule<PraybillVO> {
                         if("55A3".equals(praybillItemVO.getCsourcetypecode())){
                             Map<String,Object> map = new HashMap<>();
                             map.put("num",praybillItemVO.getNastnum());
-                            map.put("pk",praybillItemVO.getCfirstbid());
+                            map.put("pk",praybillItemVO.getCsourcebid());
                             pk.add(praybillItemVO.getCsourcebid());
                             updateList.add(map);
                         }