工步调配原料功能

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

@@ -49,7 +49,7 @@ public class MesRawSnWeightRecordServiceImpl implements IMesRawSnWeightRecordSer
         if (weightCfg == null) {
             return;
         }
-        double remainQty = getRemainQty(organizeCode, context.getAssemblyPartNo());
+        double remainQty = getRemainQty(organizeCode, context.getAssemblyPartNo(), context.getAssemblySn());
 
         MesRawSnWeightRecord record = new MesRawSnWeightRecord();
         record.setOrganizeCode(organizeCode);
@@ -88,9 +88,10 @@ public class MesRawSnWeightRecordServiceImpl implements IMesRawSnWeightRecordSer
         rawSnWeightRecordRDao.insert(record);
     }
 
-    private double getRemainQty(String organizeCode, String partNo) {
+    private double getRemainQty(String organizeCode, String partNo, String barcode) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(barcode, "barCode", ddlPackBean);
         DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean);
         MesRawSnWeightRecord record = rawSnWeightRecordRDao.getByProperty(ddlPackBean);
         if (record != null) {

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

@@ -229,6 +229,8 @@ public class MesFunctionDialogInputRawMixWeightService extends BaseSwsService im
                 prodRuleContext.assemblyDataJson(productionAssemblyContextList);
                 return false;
             }
+
+            prodRuleContext.setEachCavityQty(totalQty);
         }
         return true;
     }