Merge branch 'dev_temp_xw202503020000_45316' into dev

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

@@ -1279,7 +1279,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
 
             version = productVersionRepository.getByProperty(ddlPackBean);
             if (version != null) {
-                source = version.getShipInventoryPoint();
+                source = version.getReceiveInventoryPoint();
             }
         }
 

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

@@ -4,8 +4,6 @@ import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesProdOrgExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionRecordService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
-import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@@ -20,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 

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

@@ -114,7 +114,6 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
         DdlPreparedPack.getStringEqualPack(bean.getPullCode(), "pullCode", packBeanOne);
         DdlPreparedPack.getStringEqualPack(bean.getPullingOrderNo(), "pullingOrderNo", packBeanOne);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBeanOne);
-//        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PULL_ORDER_STATUS.PULL_ORDER_STATUS_10.getValue(), "pullOrderStatus", packBeanOne);
         MesPullingOrderInfo mesPullingOrderInfo = mesPullingOrderInfoRepository.getByProperty(packBeanOne);
         if (StringUtil.isEmpty(mesPullingOrderInfo)) {
             MesPcnException.throwMesBusiException("扫描拉动单号【%s】查询数据为空", bean.getPullingOrderNo());
@@ -134,9 +133,10 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
             //修改当前单号之前的为可强过
             DdlPackBean packBeanPass = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
             DdlPreparedPack.getStringEqualPack(bean.getPullCode(), "pullCode", packBeanPass);
-            DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PULL_ORDER_STATUS.PULL_ORDER_STATUS_10.getValue(), "pullOrderStatus", packBeanOne);
+            DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PULL_ORDER_STATUS.PULL_ORDER_STATUS_10.getValue(), "pullOrderStatus", packBeanPass);
             DdlPreparedPack.getStringSmallerNotEqualPack(bean.getPullingOrderNo(), "pullingOrderNo", packBeanPass);
             DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBeanPass);
+            DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPassCode", packBeanPass);
             List<MesPullingOrderInfo> mesPullingOrderInfos = mesPullingOrderInfoRepository.findByHqlWhere(packBeanPass);
             if (!CollectionUtils.isEmpty(mesPullingOrderInfos)) {
                 for (MesPullingOrderInfo pullingOrderInfo : mesPullingOrderInfos) {

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

@@ -596,7 +596,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         Map<String, Object> propertyMap = new HashMap<>();
 
         LOGGER.info("工单【{}]】报工原数量【{}】", oldMesWorkOrder.getWorkOrderNo(), oldMesWorkOrder.getReportedQty());
-        double reportQty = MathOperation.add(MesPcnExtConstWords.ONE, oldMesWorkOrder.getReportedQty());
+        double reportQty = MathOperation.add(productionRecord.getQty(), oldMesWorkOrder.getReportedQty());
         propertyMap.put("reportedQty", reportQty);
         if (StringUtils.isEmpty(productionRecord.getWorkOrderNo())) {
             double unCompleteQty = MathOperation.sub(oldMesWorkOrder.getQty(),  reportQty);
@@ -761,7 +761,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             newMesProductOffLine.setReportSn(productionRecord.getProductSn());
             newMesProductOffLine.setSerialNumber(productionRecord.getSerialNumber());
         }
-        newMesProductOffLine.setQty(1d);
+        newMesProductOffLine.setItemQty(productionRecord.getQty()* mesBom.getItemQty());
+        newMesProductOffLine.setQty(productionRecord.getQty());
         newMesProductOffLine.setBomVersion(oldMesWorkOrder.getProductVersion());
         newMesProductOffLine.setUnit(mesBom.getUnit());
         newMesProductOffLine.setBomCode(mesBom.getBomCode());