diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesRawSnWeightRecordServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesRawSnWeightRecordServiceImpl.java index 22aa6d6..0e4ec52 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesRawSnWeightRecordServiceImpl.java +++ b/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) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionDialogInputRawMixWeightService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionDialogInputRawMixWeightService.java index 76672ce..bf8a992 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionDialogInputRawMixWeightService.java +++ b/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; }