diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java index 239a40a..408453e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.model.CustQtyByTimeChartDataModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanCfgModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanViewModel; +import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.mes.pcn.util.DateUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -112,6 +113,7 @@ public class MesShippingKanbanCfgServiceImpl implements IMesShippingKanbanCfgSer oldCfg.setCustStartShift(cfg.getCustStartShift()); oldCfg.setInterStartShift(cfg.getInterStartShift()); oldCfg.setCustJph(cfg.getCustJph()); + oldCfg.setCarouselTime(cfg.getCarouselTime()); ConvertBean.serviceModelUpdate(oldCfg, username); shippingKanbanCfgRDao.update(oldCfg); @@ -321,16 +323,23 @@ public class MesShippingKanbanCfgServiceImpl implements IMesShippingKanbanCfgSer @Override public void doCreateCustQtyByTime(String organizeCode, String username) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + Set handleShippingGroup = new HashSet<>(); List kanbanCfg = shippingKanbanCfgRDao.findByHqlWhere(packBean); for (MesShippingKanbanCfg cfg : kanbanCfg) { if (StringUtils.isEmpty(cfg.getShippingGroupCode())) { continue; } for (String shippingGroupCode : cfg.getShippingGroupCode().split(",")) { + if (handleShippingGroup.contains(shippingGroupCode)) { + continue; + } + handleShippingGroup.add(shippingGroupCode); + int custQty = getClientStockQtyForJob(cfg, shippingGroupCode); MesCustQtyByTime byTime = new MesCustQtyByTime(); byTime.setShippingGroupCode(shippingGroupCode); byTime.setCustQty(custQty); + byTime.setOrganizeCode(organizeCode); ConvertBean.serviceModelInitialize(byTime, username); custQtyByTimeRDao.insert(byTime); }