From 7cdb188ddd1655cae52c5146db8069d0288a5a97 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 31 七月 2025 12:40:31 +0800
Subject: [PATCH] #erp读取实际数量
---
src/main/resources/mapper/OrderDetlMapper.xml | 14 ++++++-
src/main/java/com/zy/asrs/service/OrderDetlService.java | 3 +
src/main/java/com/zy/asrs/controller/OpenController.java | 9 ++--
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 3 +
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 3 +
src/main/java/com/zy/asrs/entity/AcQuantity.java | 62 +++++++++++++++++++++++++++++++
6 files changed, 85 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 28fea63..88f3cfc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.AcQuantity;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.*;
@@ -142,10 +143,10 @@
*
*/
@PostMapping("/order/AcQuantity/default/v1")
- public synchronized R loadQuantity(@RequestParam String orderNo){
- List<OrderDetl> OrderDetlList;
- if(orderNo != null){
- OrderDetlList = orderDetlService.loadQuantity(orderNo);
+ public synchronized R loadQuantity(@RequestBody AcQuantity param){
+ List<AcQuantity> OrderDetlList;
+ if(param.getOrderNo() != null){
+ OrderDetlList = orderDetlService.loadQuantity(param.getOrderNo());
}else{
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
diff --git a/src/main/java/com/zy/asrs/entity/AcQuantity.java b/src/main/java/com/zy/asrs/entity/AcQuantity.java
new file mode 100644
index 0000000..6e92363
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/AcQuantity.java
@@ -0,0 +1,62 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName("man_order_detl")
+public class AcQuantity {
+ /**
+ * 璁㈠崟鍐呯爜
+ */
+ @ApiModelProperty(value = "璁㈠崟鍐呯爜")
+ @TableField("order_id")
+ private Long orderId;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 浣滀笟鏁伴噺
+ * <p>
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
+ */
+ @ApiModelProperty(value = "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ * <p>
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
+ private Double qty;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ /**
+ * 浠ｇ爜
+ */
+ @ApiModelProperty(value = "浠ｇ爜")
+ private String model;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 101566d..4b77393 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.AcQuantity;
import com.zy.asrs.entity.OrderDetl;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -18,7 +19,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<AcQuantity> 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 b8a19f7..51fa289 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.AcQuantity;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
@@ -48,7 +49,7 @@
boolean increaseWorkQty(OrderDetl orderDetl, Double workQty);
List<OrderDetl> selectItem(String orderNo);
- List<OrderDetl> loadQuantity(String orderNo);
+ List<AcQuantity> 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 210ff7b..71c2bc7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.zy.asrs.entity.AcQuantity;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
@@ -31,7 +32,7 @@
}
@Override
- public List<OrderDetl> loadQuantity(String orderNo){
+ public List<AcQuantity> loadQuantity(String orderNo){
return baseMapper.loadQuantity(orderNo);
}
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index de039ad..bddb24f 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -60,6 +60,16 @@
<result column="packing" property="packing" />
<result column="det_id" property="detId"/>
</resultMap>
+ <resultMap id="AcResultMap" type="com.zy.asrs.entity.AcQuantity">
+ <result column="order_id" property="orderId" />
+ <result column="order_no" property="orderNo" />
+ <result column="anfme" property="anfme" />
+ <result column="work_qty" property="workQty" />
+ <result column="qty" property="qty" />
+ <result column="maktx" property="maktx" />
+ <result column="model" property="model" />
+
+ </resultMap>
<select id="selectItem" resultMap="BaseResultMap">
select * from man_order_detl
@@ -98,8 +108,8 @@
and qty < anfme
</select>
- <select id="loadQuantity" resultMap="BaseResultMap">
- select order_id,order_no,model,maktx,anfme,qty from man_order_detl
+ <select id="loadQuantity" resultMap="AcResultMap">
+ select order_id,order_no,model,maktx,anfme,qty,work_qty from man_order_detl
where order_no = #{orderNo}
</select>
--
Gitblit v1.9.1