From 0e174699453044ba39deefc5fbe8676207e63fe1 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 21 三月 2022 16:04:51 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 16 ++++++++++++++++
src/main/java/zy/cloud/wms/manager/entity/Pickout.java | 5 +++++
src/main/java/zy/cloud/wms/manager/controller/PakoutController.java | 19 ++++++++++++++-----
src/main/java/zy/cloud/wms/manager/service/OrderService.java | 2 ++
src/main/java/zy/cloud/wms/manager/mapper/OrderMapper.java | 3 +++
src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java | 3 +++
src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java | 3 ++-
src/main/resources/mapper/PickoutDetlMapper.xml | 1 +
src/main/java/zy/cloud/wms/common/service/MainService.java | 2 ++
src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java | 5 +++++
10 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index 2e299b5..1ee698d 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -437,6 +437,8 @@
pickout.setUserId(userId);
pickout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
pickout.setWrkSts(1L);
+ pickout.setOrderQty(1);
+ pickout.setOrderNos(orderStoDto.getOrderNo());
pickout.setCreateBy(userId.intValue());
pickout.setUpdateBy(userId.intValue());
pickoutService.insert(pickout);
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();
}
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Pickout.java b/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
index 7533277..30ff890 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
@@ -92,6 +92,11 @@
@ApiModelProperty(value= "")
private String memo;
+ @TableField("order_qty")
+ private Integer orderQty;
+
+ @TableField("order_nos")
+ private String orderNos;
public Pickout() {}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java b/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
index e90df81..79d3e56 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
@@ -225,6 +225,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField("wrk_no")
+ private String wrkNo;
+
public PickoutDetl() {}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/OrderMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/OrderMapper.java
index 095c175..42447b1 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/OrderMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/OrderMapper.java
@@ -22,4 +22,7 @@
void updateStatus(@Param("orderNo") String order);
void changeSettleTo12(@Param("orderNo") String orderIds);
+
+ void updateWrkSts(@Param("wrkNo") String wrkNo, @Param("docNum") String docNum, @Param("wrkSts") Integer wrkSts, @Param("userId") Long userId, @Param("hostId")
+ Long hostId);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/OrderService.java b/src/main/java/zy/cloud/wms/manager/service/OrderService.java
index 92af9fd..b2bf5f4 100644
--- a/src/main/java/zy/cloud/wms/manager/service/OrderService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/OrderService.java
@@ -23,4 +23,6 @@
void updateStatus(String order);
void changeSettleTo12(String orderIds);
+
+ void stockOutPrint(String wrkNo, String docNumber, Long userId, Long hostId);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java
index 39ffe94..b87ace1 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java
@@ -62,5 +62,10 @@
this.baseMapper.changeSettleTo12(orderIds);
}
+ @Override
+ public void stockOutPrint(String wrkNo, String docNumber, Long userId, Long hostId) {
+ this.baseMapper.updateWrkSts(wrkNo, docNumber, 7, userId, hostId);
+ }
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java
index 245e5e3..32712df 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java
@@ -11,7 +11,8 @@
@Override
public Boolean stockOutPrint(String wrkNo, String docNum, Long userId, Long hostId) {
- return this.baseMapper.updateWrkSts(wrkNo, docNum, 2, userId, hostId)>0;
+ boolean b = this.baseMapper.updateWrkSts(wrkNo, docNum, 7, userId, hostId) > 0;
+ return b;
}
@Override
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index e4e7895..66538f8 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -52,6 +52,22 @@
<update id="changeSettleTo12">
UPDATE man_order set settle = 12 Where 1 = 1 and order_no = #{orderNo}
</update>
+ <update id="updateWrkSts">
+ update man_order
+ set wrk_sts = #{wrkSts}
+ , update_by = #{userId}
+ , update_time = getdate()
+ where 1=1
+ <if test="hostId != null and hostId != ''">
+ and host_id = #{hostId}
+ </if>
+ <if test="wrkNo != null and wrkNo != ''">
+ and wrk_no = #{wrkNo}
+ </if>
+ <if test="docNum != null and docNum != ''">
+ and order_no = #{docNum}
+ </if>
+ </update>
<select id="getPage" resultMap="BaseResultMap">
select * from
diff --git a/src/main/resources/mapper/PickoutDetlMapper.xml b/src/main/resources/mapper/PickoutDetlMapper.xml
index e5a3f3a..aa837e3 100644
--- a/src/main/resources/mapper/PickoutDetlMapper.xml
+++ b/src/main/resources/mapper/PickoutDetlMapper.xml
@@ -30,6 +30,7 @@
<result column="update_time" property="updateTime" />
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
+ <result column="wrk_no" property="wrkNo" />
</resultMap>
--
Gitblit v1.9.1