From e170c300cd11406d414e7da156fc6b2da1c13915 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 31 七月 2025 12:27:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 3 +++
src/main/resources/mapper/OrderDetlMapper.xml | 5 +++++
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 3 ++-
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 20 ++++++++++++++++++++
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 1 +
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 5 +++++
src/main/resources/license.lic | 0
8 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6cdf87b..28fea63 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,10 +8,13 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.impl.OrderDetlServiceImpl;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -48,6 +51,9 @@
@Autowired
private LocMastService locMastService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
@Deprecated
@PostMapping("/grouping")
@@ -131,6 +137,20 @@
// openService.packageUp(param);
// return R.ok();
// }
+ /**
+ * 鍗曟嵁瀹為檯鏁伴噺璇诲彇
+ *
+ */
+ @PostMapping("/order/AcQuantity/default/v1")
+ public synchronized R loadQuantity(@RequestParam String orderNo){
+ List<OrderDetl> OrderDetlList;
+ if(orderNo != null){
+ OrderDetlList = orderDetlService.loadQuantity(orderNo);
+ }else{
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ return R.ok().add(OrderDetlList);
+ }
/**
* 娣诲姞鍏ュ簱鍗�
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 612f4d3..101566d 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -18,6 +18,7 @@
List<OrderDetl> selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
List<OrderDetl> selectWorkingDetls(Long orderId);
+ List<OrderDetl> loadQuantity(String orderNo);
List<OrderDetl> getPakoutPage(Map<String, Object> map);
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index ddee929..b8a19f7 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -48,6 +48,8 @@
boolean increaseWorkQty(OrderDetl orderDetl, Double workQty);
List<OrderDetl> selectItem(String orderNo);
+ List<OrderDetl> loadQuantity(String orderNo);
+
OrderDetl selectItem(WaitPakin waitPakin);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 548f49c..210ff7b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -31,6 +31,11 @@
}
@Override
+ public List<OrderDetl> loadQuantity(String orderNo){
+ return baseMapper.loadQuantity(orderNo);
+ }
+
+ @Override
public List<OrderDetl> selectItem(String orderNo) {
return this.baseMapper.listByOrderNo(orderNo);
}
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 0aafb3b..6ea2b36 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -61,6 +61,9 @@
*/
@RequestMapping(value = "/getLicenseDays")
public R getLicenseDays() {
+// if (true){
+// return R.ok().add(999);
+// }
LicenseVerify licenseVerify = new LicenseVerify();
LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
if (verifyInfo == null) {
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 1659df2..dc0ab2d 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -82,8 +82,9 @@
LicenseContent install = licenseVerify.install(param);
logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
-
return install != null;
+
+// return true;
} catch (Exception e) {
return false;
}
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index d0f9be9..a92b095 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index f7ae4f7..de039ad 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -98,6 +98,11 @@
and qty < anfme
</select>
+ <select id="loadQuantity" resultMap="BaseResultMap">
+ select order_id,order_no,model,maktx,anfme,qty from man_order_detl
+ where order_no = #{orderNo}
+ </select>
+
<sql id="pakOutPageCondition">
<if test="order_id!=null and order_id!='' ">
and mod.order_id like '%' + #{order_id} + '%'
--
Gitblit v1.9.1