Commit e1aa54a415f3fc4d85394f2ecdcf1ff4188e6d82

Authored by 肖超群
2 parents ca887132 e39fbc95

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4 into develop

huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java
... ... @@ -22,6 +22,7 @@ import org.jeecg.modules.wms.config.shipmentType.entity.ShipmentType;
22 22 import org.jeecg.modules.wms.config.shipmentType.service.IShipmentTypeService;
23 23 import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfig;
24 24 import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfigDetail;
  25 +import org.jeecg.modules.wms.config.waveConfig.service.IWaveConfigService;
25 26 import org.jeecg.modules.wms.config.zone.entity.Zone;
26 27 import org.jeecg.modules.wms.config.zone.service.IZoneService;
27 28 import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
... ... @@ -116,6 +117,9 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper,
116 117  
117 118 @Resource
118 119 private IZoneService zoneService;
  120 +
  121 + @Resource
  122 + private IWaveConfigService waveConfigService;
119 123  
120 124 @Resource
121 125 private IShipmentContainerAdviceService shipmentContainerAdviceService;
... ... @@ -596,6 +600,12 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper,
596 600 if (!result.isSuccess()) {
597 601 throw new JeecgBootException("波次自动出库失败,波次ID:" + waveConfigDetailList.get(0).getId());
598 602 }
  603 + if (waveConfig.getWaveCycle() != null) {
  604 + LambdaUpdateWrapper<WaveConfig> updateWrapper = Wrappers.lambdaUpdate();
  605 + updateWrapper.eq(WaveConfig::getId, waveConfig.getId());
  606 + updateWrapper.set(WaveConfig::getWaveCycle, waveConfig.getWaveCycle() - 1);
  607 + waveConfigService.update(new WaveConfig(), updateWrapper);
  608 + }
599 609 return Result.OK("波次自动出库成功");
600 610 }
601 611  
... ...