From 46607139e955ca266e24bd8561bca1f93a650178 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas
---
src/main/java/zy/cloud/wms/manager/controller/PakoutController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PakoutController.java b/src/main/java/zy/cloud/wms/manager/controller/PakoutController.java
index 7b09490..73b9f80 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PakoutController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PakoutController.java
@@ -13,7 +13,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
+import zy.cloud.wms.manager.entity.Order;
import zy.cloud.wms.manager.entity.Pakout;
+import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.PakoutService;
import java.util.ArrayList;
@@ -26,6 +28,8 @@
@Autowired
private PakoutService pakoutService;
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/pakout/{id}/auth")
@ManagerAuth
@@ -139,13 +143,18 @@
@RequestMapping(value = "/pakout/print/auth")
@ManagerAuth
public R print(@RequestParam String docNumber) {
- List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("host_id", getHostId()));
- if (!Cools.isEmpty(pakouts)) {
- if (pakouts.get(0).getWrkSts() == 1) {
- pakoutService.stockOutPrint(null, docNumber, getUserId(), getHostId());
+ Order order_no = orderService.selectOne(new EntityWrapper<Order>()
+ .eq("order_no", docNumber));
+ if (!Cools.isEmpty(order_no)) {
+ if (order_no.getSettle() == 2) {
+ order_no.setSettle(7L);
+ orderService.update(order_no,new EntityWrapper<Order>()
+ .eq("order_no",docNumber));
+ return R.ok();
}
+
}
- return R.ok();
+ return R.error();
}
}
--
Gitblit v1.9.1