From 74b35955ebfd42f8a9b31f56a3a9ac5181c96443 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 21 十二月 2025 09:29:49 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/order/outUQ.html | 6 +++---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 7 +++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 27 +++++++++++++++++++++++++--
src/main/resources/mapper/LocDetlMapper.xml | 4 +++-
src/main/webapp/views/order/outMes.html | 6 +++---
src/main/webapp/views/order/outReturn.html | 6 +++---
src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java | 2 ++
7 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 28a92e6..42998de 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,6 +7,8 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.OutLocInfoParam;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.mapper.LocDetlMapper;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,9 @@
@Autowired
private OpenService openService;
+
+ @Autowired
+ private LocDetlMapper locDetlMapper;
@PostMapping("/scrk")
@AppAuth(memo = "GWMS璋冪敤鐢熸垚鍏ュ簱宸ヤ綔妗�")
@@ -503,13 +508,31 @@
}
/**
+ * 鏄惁鍚堟牸
+ */
+ @PostMapping("/check/auth/v1")
+ @AppAuth(memo = "妫�楠屾槸鍚﹀悎鏍�")
+ public synchronized R check(@RequestHeader(required = false) String appkey,
+ @RequestBody UnQualifiedOrderConfirmParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
+ for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
+ if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
+ locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified());
+ }
+ }
+ return R.ok(param);
+ }
+
+ /**
* 閫�搴撳崟锛堝嚭搴擄級
*/
@PostMapping("/unQualifiedOrder/auth/v1")
@AppAuth(memo = "涓嶅悎鏍煎搧閫�搴撳崟鍗曟嵁涓嬪彂")
public synchronized R unqualifiedOrder(@RequestHeader(required = false) String appkey,
- @RequestBody UnQualifiedOrderConfirmParam param,
- HttpServletRequest request) {
+ @RequestBody UnQualifiedOrderConfirmParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
openService.unQualifiedOrder(param);
return R.ok(param);
diff --git a/src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java b/src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java
index ecdbafb..7063b9f 100644
--- a/src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java
@@ -8,6 +8,8 @@
public class UnQualifiedOrderConfirmParam {
private String orderNumber; //缁勮揣鍗曞彿
private List<VolumeNumber> volumeNumbers; // 澶氫釜鍖呰缁勫彿
+ private String qualified; // 1鍚堟牸2涓嶅悎鏍硷紝3涓嶅悎鏍煎崟鏀捐
+
private String memo;//澶囨敞
@Data
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 1c05beb..eae0a23 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -112,4 +112,11 @@
* @param qualified 鏍￠獙缁撴灉 鍚堟牸/涓嶅悎鏍�
*/
void updateQualifiedByRollNo(@Param("rollNo") String rollNo, @Param("qualified") String qualified);
+
+ /**
+ * 鏇存柊鎴愬搧鏍￠獙缁撴灉
+ * @param brand 鍖呰缁勫彿
+ * @param qualified 鏍￠獙缁撴灉 鍚堟牸/涓嶅悎鏍�
+ */
+ void updateQualifiedByBrand(@Param("brand") String brand, @Param("qualified") String qualified);
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index bcb05be..1cad7ac 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -447,5 +447,7 @@
update asr_loc_detl set three_code = #{qualified} where model = #{rollNo}
</update>
-
+ <update id="updateQualifiedByBrand">
+ update asr_loc_detl set three_code = #{qualified} where brand = #{brand}
+ </update>
</mapper>
diff --git a/src/main/webapp/views/order/outMes.html b/src/main/webapp/views/order/outMes.html
index a57ac6d..681b9b2 100644
--- a/src/main/webapp/views/order/outMes.html
+++ b/src/main/webapp/views/order/outMes.html
@@ -152,9 +152,9 @@
<!-- 琛屽伐鍏锋爮 -->
<script type="text/html" id="operate">
-<!-- {{#if (d.enableQty > 0){ }}-->
-<!-- <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>-->
-<!-- {{# } }}-->
+ {{#if (d.enableQty > 0){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>
+ {{# } }}
</script>
<!-- 鍑哄簱棰勮 -->
diff --git a/src/main/webapp/views/order/outReturn.html b/src/main/webapp/views/order/outReturn.html
index 1674526..272718b 100644
--- a/src/main/webapp/views/order/outReturn.html
+++ b/src/main/webapp/views/order/outReturn.html
@@ -152,9 +152,9 @@
<!-- 琛屽伐鍏锋爮 -->
<script type="text/html" id="operate">
-<!-- {{#if (d.enableQty > 0){ }}-->
-<!-- <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>-->
-<!-- {{# } }}-->
+ {{#if (d.enableQty > 0){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>
+ {{# } }}
</script>
<!-- 鍑哄簱棰勮 -->
diff --git a/src/main/webapp/views/order/outUQ.html b/src/main/webapp/views/order/outUQ.html
index 0921faf..21593c4 100644
--- a/src/main/webapp/views/order/outUQ.html
+++ b/src/main/webapp/views/order/outUQ.html
@@ -152,9 +152,9 @@
<!-- 琛屽伐鍏锋爮 -->
<script type="text/html" id="operate">
-<!-- {{#if (d.enableQty > 0){ }}-->
-<!-- <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>-->
-<!-- {{# } }}-->
+ {{#if (d.enableQty > 0){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>
+ {{# } }}
</script>
<!-- 鍑哄簱棰勮 -->
--
Gitblit v1.9.1