mes-ptr完善逻辑

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java

@@ -348,9 +348,9 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                 //查询ptr总成
                 DdlPackBean detailPartPtr = DdlPackBean.getDdlPackBean(organizeCode);
                 DdlPreparedPack.getNumEqualPack(mesPartPtr.getId(),"ptrId",detailPartPtr);
-                DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(),"partNo",detailPartPtr);
-                int detailPtrPartCount = partPtrDetailRao.findByHqlWhereCount(detailPartPtr);
-                if (detailPtrPartCount > 0){
+                DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(),"totalPartNo",detailPartPtr);
+                List<MesPartPtrDetail> ptrDetailList = partPtrDetailRao.findByHqlWhere(detailPartPtr);
+                if (!ptrDetailList.isEmpty()){
                     //根据mesPartPtr的目标零件号，找到零件信息
                     String destPartNo = mesPartPtr.getDestPartNo();
                     String srcPartNo = mesPartPtr.getSrcPartNo();
@@ -358,6 +358,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                     //更新物料清单
                     MesWorkOrderPart orderPart = orderPartMap.get(srcPartNo);
                     if (orderPart != null) {
+                        MesPartPtrDetail mesPartPtrDetail = ptrDetailList.get(0);
                         orderPart.setPartNo(mesPartSap.getPartNo());
                         orderPart.setPartName(mesPartSap.getPartName());
                         orderPart.setShippingPartNo(mesPartSap.getPartNo());
@@ -365,20 +366,16 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                         if (!isModifyPOrder){
                             isModifyPOrder = true;
                         }
+                        mesWorkOrder.setRemark(mesPartPtr.getRemark());
+                        String ptrInfoStr = "INFO"+mesPartPtr.getId()+"|PART"+mesPartPtrDetail.getId();
+                        mesWorkOrder.setPtrInfo(ptrInfoStr);
                         //更新mes_part_ptr的实际数量 + 1
                         mesPartPtr.setPrtVehicleActualCount(mesPartPtr.getPrtVehicleActualCount() + 1);
                         ConvertBean.saveOrUpdate(mesPartPtr,"JOB");
                         partPtrRao.update(mesPartPtr);
-                        DdlPackBean partPtrDetailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-                        DdlPreparedPack.getNumEqualPack(mesPartPtr.getId(),"ptrId",partPtrDetailPackBean);
-                        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(),"totalPartNo",partPtrDetailPackBean);
-                        List<MesPartPtrDetail> partPtrDetailList = partPtrDetailRao.findByHqlWhere(partPtrDetailPackBean);
-                        if (!partPtrDetailList.isEmpty()){
-                            MesPartPtrDetail mesPartPtrDetail = partPtrDetailList.get(0);
-                            mesPartPtrDetail.setQty(mesPartPtrDetail.getQty() + 1);
-                            ConvertBean.saveOrUpdate(mesPartPtrDetail,"JOB");
-                            partPtrDetailRao.update(mesPartPtrDetail);
-                        }
+                        mesPartPtrDetail.setQty(mesPartPtrDetail.getQty() + 1);
+                        ConvertBean.saveOrUpdate(mesPartPtrDetail,"JOB");
+                        partPtrDetailRao.update(mesPartPtrDetail);
                         //更新mes_part_ptr_detail 的workOrder.partNo  数量加 1 ;替换了几次还是什么
                     }
                 }