jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev-temp-wj-2412190000-44423' into dev

Browse Source
dev-temp-nht-202502180000-customprint
王杰 5 months ago
parent 0552ad769d e602f615b9
commit 0da9863cf7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
Unescape Escape View File

@ -396,10 +396,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
for (MesProductionAssembly productionAssembly : productionAssemblyList) { for (MesProductionAssembly productionAssembly : productionAssemblyList) {
if (null == productionAssembly) continue; if (null == productionAssembly) continue;
if (productionAssembly.getMatchType().compareTo(MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_10.getValue()) != 0) continue; if (productionAssembly.getMatchType().compareTo(MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_10.getValue()) != 0) continue;
if (StringUtils.isEmpty(productionAssembly.getProductSn()) || StringUtils.isEmpty(productionAssembly.getPartNo())) continue; if (StringUtils.isEmpty(productionAssembly.getAssemblySn()) || StringUtils.isEmpty(productionAssembly.getAssemblyPartNo())) continue;
packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode()); packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(productionAssembly.getProductSn(), MesPcnExtConstWords.PRODUCT_SN, packBean); DdlPreparedPack.getStringEqualPack(productionAssembly.getAssemblySn(), MesPcnExtConstWords.PRODUCT_SN, packBean);
DdlPreparedPack.getStringEqualPack(productionAssembly.getPartNo(), MesPcnExtConstWords.PART_NO, packBean); DdlPreparedPack.getStringEqualPack(productionAssembly.getAssemblyPartNo(), MesPcnExtConstWords.PART_NO, packBean);
DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PRODUCE_SN_STATUS.ASSEMBLY.getValue(), MesPcnExtConstWords.SN_STATUS, packBean); DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PRODUCE_SN_STATUS.ASSEMBLY.getValue(), MesPcnExtConstWords.SN_STATUS, packBean);
produceSnExtService.saveProduceSntatusByDdlPackBean(packBean, requestModel.getUserName(), MesExtEnumUtil.PRODUCE_SN_STATUS.ASSEMBLY_BACK.getValue()); produceSnExtService.saveProduceSntatusByDdlPackBean(packBean, requestModel.getUserName(), MesExtEnumUtil.PRODUCE_SN_STATUS.ASSEMBLY_BACK.getValue());
} }

Write Preview
Loading…
Cancel
Save