From a9325d1f1913890dd53296abc4490d9ef95a4e53 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 26 十一月 2024 09:53:13 +0800
Subject: [PATCH] 发货前核对功能
---
src/main/resources/mapper/OrderDetlMapper.xml | 3 +
src/main/resources/mapper/OrderMapper.xml | 5 ++
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 4 ++
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 5 ++
src/main/java/com/zy/asrs/entity/param/PdaDhhdParam.java | 35 +++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 21 ++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 36 ++++++++++++++++++
src/main/java/com/zy/asrs/service/MobileService.java | 5 ++
8 files changed, 113 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ed2236d..96b3c97 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
@@ -18,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -54,6 +57,12 @@
private WrkDetlLogService wrkDetlLogService;
@Autowired
private RgvOneSignService rgvOneSignService;
+
+ @Resource
+ private OrderMapper orderMapper;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
// 鍟嗗搧涓婃灦
@@ -589,4 +598,31 @@
return mobileService.pdaFxprk(param, getUserId());
}
+ @PostMapping("/pdaFhhd")
+ @ManagerAuth(memo = "pda鍙戣揣鏍稿")
+ public synchronized R pdaFhhd(@RequestBody PdaDhhdParam param) {
+
+ if (Cools.isEmpty(param)) {
+ return R.parse("鍙傛暟鏈夎锛岃妫�鏌ュ弬鏁�");
+ }
+
+ return mobileService.pdaFhhd(param, getUserId());
+ }
+
+ @GetMapping("/getOrderNoList/{orderNo}")
+ @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋ā绯婃煡璇㈠崟鎹�")
+ public synchronized R getOrderByLikeOrderNo(@PathVariable("orderNo") String orderNo) {
+
+ return R.ok(orderMapper.selectOrderNosByOrderNoLike(orderNo));
+
+ }
+
+ @GetMapping("/getOrderDetlByOrderNo/{orderNo}")
+ @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋煡璇㈠崟鎹槑缁�")
+ public synchronized R getOrderByOrderNo(@PathVariable("orderNo") String orderNo) {
+
+ return R.ok(orderDetlMapper.selectDetlList(orderNo));
+
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/PdaDhhdParam.java b/src/main/java/com/zy/asrs/entity/param/PdaDhhdParam.java
new file mode 100644
index 0000000..7e6e703
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/PdaDhhdParam.java
@@ -0,0 +1,35 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/**
+ * @author pang.jiabao
+ * @description pda鍙戣揣鏍稿鎻愪氦鏄庣粏
+ * @createDate 2024/11/26 8:31
+ */
+@Data
+public class PdaDhhdParam {
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ private String orderNo;
+
+// /**
+// * 鏍稿鏄庣粏鍒楄〃
+// */
+// private List<HdDto> hdDtoList;
+//
+// public static class HdDto{
+// /**
+// * 鍖呰缁勫彿
+// */
+// private String packageGroupNo;
+//
+// /**
+// * 鏍稿鏍囪瘑 0.鏈牳瀵癸紝1鏍稿瀹屾垚
+// */
+// private int flag;
+// }
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 151f68f..4671efa 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -59,4 +59,8 @@
*/
List<OrderDetl> selectMoveLocDetl();
+ /**
+ * 鑾峰彇鍖呰缁勫彿鍒楄〃
+ */
+ List<String> selectDetlList(@Param("orderNo") String orderNo);
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 8dd8494..d2885fb 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -36,4 +36,9 @@
* 鏇存柊璁㈠崟澶囪揣鐘舵��
*/
void updateStatusByOrderNo(@Param("orderNo") String orderNo,@Param("status") int status,@Param("userId") int userId);
+
+ /**
+ * 鏍规嵁鍗曟嵁缂栧彿妯＄硦鏌ヨ鍗曟嵁缂栧彿
+ */
+ List<String> selectOrderNosByOrderNoLike(@Param("orderNo") String orderNo);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 6adac9d..aa10f0c 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -71,4 +71,9 @@
* 鐩樼偣寮傚父鎸夊疄鐗╄皟鏁村簱瀛樹俊鎭�
*/
R pdtz(PdtzParam param);
+
+ /**
+ * 鍙戣揣鏍稿
+ */
+ R pdaFhhd(PdaDhhdParam param,Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 37969e5..1df5114 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1817,6 +1817,27 @@
return R.ok("璋冩暣鎴愬姛");
}
+ @Override
+ public R pdaFhhd(PdaDhhdParam param, Long userId) {
+
+ String orderNo = param.getOrderNo();
+
+ Order order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ return R.parse("鍗曟嵁缂栧彿涓嶅瓨鍦細" + orderNo);
+ } else if (!order.getSettle().equals(4L)) {
+ return R.parse("鍗曟嵁鐘舵�佷笉涓�4.宸插畬鎴�");
+ }
+
+ order.setSettle(5L);
+ order.setUpdateBy(userId);
+ order.setUpdateTime(new Date());
+
+ orderService.updateById(order);
+
+ return R.ok("鍙戣揣鏍稿鎴愬姛");
+ }
+
// 鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es
void kctzPushMes(JSONObject jsonObject) {
// 鎺ュ彛璇锋眰缁撴灉
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 371ada8..3097092 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -138,6 +138,9 @@
and mo.settle <= 2
and md.danger = 0
</select>
+ <select id="selectDetlList" resultType="java.lang.String">
+ select brand from man_order_detl where order_no = #{orderNo}
+ </select>
<update id="increase">
update man_order_detl
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index be78b61..6aed376 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -79,7 +79,7 @@
mo.doc_type = mt.doc_id
where
mt.pakout = 1
- and mo.settle = 4
+ and mo.settle = 5
and mo.status = 1
order by
mo.create_time asc
@@ -110,5 +110,8 @@
and md.inspect = 0
and mo.settle = 1
</select>
+ <select id="selectOrderNosByOrderNoLike" resultType="java.lang.String">
+ select order_no from man_order where settle = 4 and order_no like '%' + #{orderNo} + '%'
+ </select>
</mapper>
--
Gitblit v1.9.1