UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

现场管理单据审核

Browse Source
dev_unify
yewj 8 months ago
parent c702d8b9cf
commit 9bfc063682
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -1657,13 +1657,13 @@ public class IoCodeTempController extends BaseController {
orderService.deleteByBillNo(orderId); orderService.deleteByBillNo(orderId);
return ResultVOUtils.error(507, "上货产品不符！"); return ResultVOUtils.error(507, "上货产品不符！");
} }
}else { } else {
//todo 判断货位里面是否有相同产品 //todo 判断货位里面是否有相同产品
UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceResponses.get(0); UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceResponses.get(0);
List<IoSplitFifoCodeEntity> byRelId = fifoCodeService.findByRelId(addOrderRequest.getWorkPlaceCode(), udiRelevanceResponse1.getId()); List<IoSplitFifoCodeEntity> byRelId = fifoCodeService.findByRelId(addOrderRequest.getWorkPlaceCode(), udiRelevanceResponse1.getId());
if (byRelId != null && byRelId.size() > 0){ if (byRelId != null && byRelId.size() > 0) {
orderService.deleteByBillNo(orderId); orderService.deleteByBillNo(orderId);
return ResultVOUtils.error(507,"当前产品已绑定货位"); return ResultVOUtils.error(507, "当前产品已绑定货位");
} }
} }
if (orderEntity != null && CollUtil.isNotEmpty(codeEnttitys)) { if (orderEntity != null && CollUtil.isNotEmpty(codeEnttitys)) {
@ -2765,7 +2765,7 @@ public class IoCodeTempController extends BaseController {
Integer reCountObj = item.getScanCount(); Integer reCountObj = item.getScanCount();
int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null，则默认为0次迭代 int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null，则默认为0次迭代
for (int i = 0; i < reCount; i++) { for (int i = 0; i < reCount; i++) {
if (StrUtil.isNotBlank(code)){ if (StrUtil.isNotBlank(code)) {
codeList.add(code); codeList.add(code);
} }
} }

14
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -554,18 +554,18 @@ public class IoOrderReviewController extends BaseController {
orderEntity.setUpdateTime(null); orderEntity.setUpdateTime(null);
orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setFromType(ConstantStatus.FROM_UDISP);
orderEntity.setReviewSp(true); orderEntity.setReviewSp(true);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); // orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
if (temp == null) { if (temp == null) {
orderEntity.setId(null); orderEntity.setId(null);
orderService.insertOrder(orderEntity); orderService.insertOrder(orderEntity);
heartService.insetOrderDb(spsSyncOrderResponse, orderEntity); heartService.insetOrderDb(spsSyncOrderResponse, orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); // orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
addInoutService.dealProcess(orderEntity); // addInoutService.dealProcess(orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); // orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { // if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
ioCheckInoutService.check(orderEntity.getBillNo()); // ioCheckInoutService.check(orderEntity.getBillNo());
} // }
} }
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {

14
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -395,18 +395,18 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
orderEntity.setUpdateTime(null); orderEntity.setUpdateTime(null);
orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setFromType(ConstantStatus.FROM_UDISP);
orderEntity.setReviewSp(true); orderEntity.setReviewSp(true);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); // orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
if (temp == null) { if (temp == null) {
orderEntity.setId(null); orderEntity.setId(null);
orderService.insertOrder(orderEntity); orderService.insertOrder(orderEntity);
heartService.insetOrderDb(spsSyncOrderResponse, orderEntity); heartService.insetOrderDb(spsSyncOrderResponse, orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); // orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
addInoutService.dealProcess(orderEntity); // addInoutService.dealProcess(orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); // orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { // if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
ioCheckInoutService.check(orderEntity.getBillNo()); // ioCheckInoutService.check(orderEntity.getBillNo());
} // }
} }
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {

Write Preview
Loading…
Cancel
Save