Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionDialogInputOrderQtyService.java

@@ -76,6 +76,8 @@ public class MesFunctionDialogInputOrderQtyService extends BaseSwsService implem
             List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
             prodRuleContextList.stream().forEach(o -> o.eachCavityQty(buttonDynamicModel.getFunctionValue()));
 
+            productionDispatchContextStepService.dispatchProdRuleDataContext(reqBean, prodRuleContextList);
+
             reqBean.setButtonCode(buttonDynamicModel.getButtonCode());
             reqBean.setStepDialogStatus(true);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionRecordGenerateStepService.java

@@ -121,7 +121,7 @@ public class MesProductionRecordGenerateStepService extends BaseStepService {
         if (Objects.equal(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), workCell.getIsCountFinish())) {
             // 保存班次加工数量上下文
             MesProdShiftContext mesProdShiftKvBean = prodShiftRecordService.getMesProdShiftKvBean(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode());
-            Integer amount = productionCustomContextStepService.dispatchProductionStatisticsContext(reqBean, productionPsOutContextList.size(), mesProdShiftKvBean);
+            Integer amount = productionCustomContextStepService.dispatchProductionStatisticsContext(reqBean, getProductionStatisticsQty(productionPsOutContextList), mesProdShiftKvBean);
             this.sendMessage(reqBean, new StationResultBean().writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PROCESS.getValue()), String.format("生产线[%s]工位[%s]当前累加数[%s]已累计加工数[%s]", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), productionPsOutContextList.size(), amount), MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT);
         }
 
@@ -129,6 +129,11 @@ public class MesProductionRecordGenerateStepService extends BaseStepService {
 
     }
 
+    private Integer getProductionStatisticsQty(List<MesProductionPsOutContext> productionPsOutContextList) {
+        Double qty = productionPsOutContextList.stream().filter(o -> null != o).mapToDouble(MesProductionPsOutContext::getQty).sum();
+        return qty.intValue();
+    }
+
     private void saveProductionRecordData(StationRequestBean reqBean, MesWorkCenter workCenter, MesScanMonitorContext scanMonitorContext, String mouldNo,
                                           List<MesProdRuleContext> prodRuleContextList, MesProductionProcessContext productionProcessContext, MesProductionPsOutContext productionPsOutContext,
                                           Map<Integer, MesProdRuleContext> prMap, MesCellEquipContext cellEquipContext, MesProductionPsInContext productionPsInContext, MesProductionPartContext productionPartContext) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesStationDeductionAssemblyStepService.java

@@ -118,6 +118,9 @@ public class MesStationDeductionAssemblyStepService extends BaseStepService {
 
             if (!stepResult.isCompleted()) return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_FEEDING), stepResult.getMsg());
 
+            //保存上下文产品加工规则信息集合
+            productionDispatchContextStepService.dispatchProdRuleDataContext(reqBean, prodRuleContextList);
+
             //重置原料条码的缓存库存
             productionCustomContextStepService.dispatchContainerPackageDetailContext(reqBean.getOrganizeCode(), remainQtyMap2Cache);