zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
@@ -7,6 +7,7 @@ import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.asrs.entity.*; import com.zy.asrs.wms.asrs.entity.enums.OrderType; import com.zy.asrs.wms.asrs.entity.template.WaitPakinTemplate; import com.zy.asrs.wms.asrs.service.*; import com.zy.asrs.wms.common.annotation.OperationLog; @@ -65,7 +66,11 @@ @PostMapping("/waitPakin/save") public R save(@RequestBody WaitPakin waitPakin) { try { waitPakinService.comb(waitPakin); if (waitPakin.getBarcode().contains("PK")) { waitPakinService.comb(waitPakin, OrderType.PK_IN_ORDER.id); } else { waitPakinService.comb(waitPakin, OrderType.UTC_IN_ORDER.id); } } catch (Exception e) { e.printStackTrace(); return R.error(e.getMessage()); @@ -177,7 +182,11 @@ waitPakin.setDetlId(orderDetl.getId()); waitPakin.setMatnr(orderDetl.getMat$().getMatnr()); waitPakin.setBatch(orderDetl.getBatch()); waitPakinService.comb(waitPakin); if (waitPakinTemplate.getBarcode().contains("PK")) { waitPakinService.comb(waitPakin, OrderType.PK_IN_ORDER.id); } else { waitPakinService.comb(waitPakin, OrderType.UTC_IN_ORDER.id); } } return R.ok(); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java
@@ -10,6 +10,6 @@ List<WaitPakin> getByOrderDetlId(Long orderDetlId); //组托 boolean comb(WaitPakin waitPakin); boolean comb(WaitPakin waitPakin, Long inType); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -126,7 +126,7 @@ //组拖通知档 waitPakins.forEach(pakin -> { waitPakinService.comb(pakin); waitPakinService.comb(pakin, ordersParam.getInType()); });
@@ -36,7 +36,7 @@ @Override @Transactional(rollbackFor = Exception.class) public boolean comb(WaitPakin waitPakin) { public boolean comb(WaitPakin waitPakin, Long inType) { //组托规则校验 waitPakinRuleService.rule(waitPakin); @@ -59,11 +59,17 @@ throw new CoolException("订单明细不存在"); } //可用数量 if (inType.equals(OrderType.PK_IN_ORDER.id)) { Double sCount = Math.round((orderDetl.getAnfme() - orderDetl.getWaitQty()) * 1000) / 1000.0; if (waitPakin.getAnfme().compareTo(sCount) > 0) { throw new CoolException("组托数量超过剩余可用数量"); } } else { // Double count = orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty() - orderDetl.getWaitQty(); Double count = Math.round((orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty()) * 1000) / 1000.0; if (waitPakin.getAnfme().compareTo(count) > 0) { throw new CoolException("组托数量超过剩余可用数量"); Double count = Math.round((orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty()) * 1000) / 1000.0; if (waitPakin.getAnfme().compareTo(count) > 0) { throw new CoolException("组托数量超过剩余可用数量"); } } //查询是否存在相同明细和托盘码的组托通知档 @@ -78,8 +84,9 @@ throw new CoolException("添加失败"); } }else { Double total = waitPakin1.getAnfme() + waitPakin.getAnfme(); //存在组托通知档，更新 waitPakin1.setAnfme(waitPakin1.getAnfme() + waitPakin.getAnfme()); waitPakin1.setAnfme(total); waitPakin1.setUpdateTime(new Date()); if (!this.updateById(waitPakin1)) { throw new CoolException("添加失败"); @@ -93,7 +100,7 @@ } //如果是平库入库单，修改订单明细执行数量 if (order.getOrderType() == OrderType.PK_IN_ORDER.id) { if (inType.equals(OrderType.PK_IN_ORDER.id)) { orderDetl.setWorkQty(waitPakin.getAnfme()); orderDetlService.updateById(orderDetl); }
