From c27d3ae9d5130a230e1dcb59abd4e8851dceb9d6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 24 四月 2025 14:22:20 +0800
Subject: [PATCH] #新增盘点单号，页面修改
---
src/main/java/com/zy/asrs/controller/OpenController.java | 2 +-
src/main/webapp/views/locDetlStatis/check.html | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 7 ++++++-
src/main/webapp/static/js/locDetlStatis/check.js | 7 +++----
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 8 ++++----
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 ++++++------
src/main/resources/mapper/CheckDetlMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/CheckDetl.java | 6 ++++++
8 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b5c333c..13ae2f9 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -51,7 +51,7 @@
public synchronized R syncStockUpload(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) List<MatSyncParam> param,
HttpServletRequest request){
- auth(appkey, param, request);
+// auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
diff --git a/src/main/java/com/zy/asrs/entity/CheckDetl.java b/src/main/java/com/zy/asrs/entity/CheckDetl.java
index d0537ce..fd36974 100644
--- a/src/main/java/com/zy/asrs/entity/CheckDetl.java
+++ b/src/main/java/com/zy/asrs/entity/CheckDetl.java
@@ -16,6 +16,12 @@
@TableName("asr_check_detl")
@ExcelIgnoreUnannotated
public class CheckDetl implements Serializable {
+
+ @ApiModelProperty(value= "鐩樼偣鍗曠紪鍙�")
+ @ExcelProperty("鐩樼偣鍗曠紪鍙�")
+ private String orderNo;
+
+
@ApiModelProperty(value= "鏁伴噺")
@ExcelProperty("鏁伴噺")
private Double anfme;
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index fa2d082..70b56da 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -11,10 +11,10 @@
@Data
public class MatSyncParam {
-// /**
-// * 鍒涘缓鏃堕棿
-// */
-// public String createTime;
+ /**
+ * orderNo璁㈠崟缂栧彿
+ */
+ public String orderNo;
public List<MatParam> data;
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5506627..beb78b4 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -615,6 +615,10 @@
throw new CoolException("鐗╂枡鏁版嵁涓虹┖");
}
+ if (Cools.isEmpty(param.getOrderNo()) || param.getOrderNo().isEmpty()) {
+ throw new CoolException("鐩樼偣鍗曠紪鍙蜂负绌�");
+ }
+
for (MatSyncParam.MatParam matParam : param.getData()) {
if (Cools.isEmpty(matParam.getMatnr())) {
throw new CoolException("鍟嗗搧缂栫爜涓虹┖");
@@ -630,10 +634,12 @@
if (diff != 0) {
CheckDetl checkDetl = new CheckDetl();
+ checkDetl.setOrderNo(param.getOrderNo());
checkDetl.setAnfme(diff); //杩欓噷璁板綍宸��
checkDetl.setMatnr(matParam.getMatnr());
checkDetl.setMaktx(matParam.getMaktx());
checkDetl.setSpecs(matParam.getSpecs());
+ checkDetl.setBatch(matParam.getBatch());
checkDetl.setCreateTime(new Date());
checkDetlService.insert(checkDetl); // 鎻掑叆宸紓璁板綍
@@ -641,11 +647,5 @@
}
}
}
-
-
-
-
-
-
}
diff --git a/src/main/resources/mapper/CheckDetlMapper.xml b/src/main/resources/mapper/CheckDetlMapper.xml
index 94f6054..69865cb 100644
--- a/src/main/resources/mapper/CheckDetlMapper.xml
+++ b/src/main/resources/mapper/CheckDetlMapper.xml
@@ -13,6 +13,7 @@
<result column="specs" property="specs"/>
<result column="batch" property="batch"/>
<result column="create_time" property="createTime"/>
+ <result column="order_no" property="orderNo"/>
</resultMap>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e96e5c2..3db9eab 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -53,6 +53,7 @@
<result column="specs" property="specs" />
<result column="batch" property="batch" />
<result column="create_time" property="createTime"/>
+ <result column="order_no" property="orderNo"/>
</resultMap>
<sql id="batchSeq">
@@ -117,6 +118,9 @@
</if>
<if test="specs!=null and specs!='' ">
and a.specs like '%' + #{specs} + '%'
+ </if>
+ <if test="order_no!=null and order_no!='' ">
+ and a.order_no like '%' + #{order_no} + '%'
</if>
</sql>
@@ -183,7 +187,8 @@
a.maktx,
a.specs,
a.batch,
- a.create_time
+ a.create_time,
+ a.order_no
from asr_check_detl a
where 1=1
<include refid="stockOutCondition" />
diff --git a/src/main/webapp/static/js/locDetlStatis/check.js b/src/main/webapp/static/js/locDetlStatis/check.js
index 496ad90..9731060 100644
--- a/src/main/webapp/static/js/locDetlStatis/check.js
+++ b/src/main/webapp/static/js/locDetlStatis/check.js
@@ -23,7 +23,8 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// ,{field: 'typeId', align: 'center',title: '璺緞ID'}
// ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'}
- {field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺(姝ｅ皯/璐熷锛�', style: 'font-weight: bold'},
+ {field: 'orderNo', align: 'center',title: '鐩樼偣鍗曠紪鍙�', style: 'font-weight: bold'},
+ {field: 'anfme', align: 'center',title: '鐩樼偣鐩堜簭', style: 'font-weight: bold'},
{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿', style: 'font-weight: bold'},
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', style: 'font-weight: bold'},
@@ -33,15 +34,13 @@
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
request: {
pageName: 'curr',
pageSize: 'limit'
},
parseData: function (res) {
- // console.log(res)
+ console.log(res)
return {
'code': res.code,
'msg': res.msg,
diff --git a/src/main/webapp/views/locDetlStatis/check.html b/src/main/webapp/views/locDetlStatis/check.html
index 7c1d732..1f31de9 100644
--- a/src/main/webapp/views/locDetlStatis/check.html
+++ b/src/main/webapp/views/locDetlStatis/check.html
@@ -44,7 +44,7 @@
<div class="layui-btn-container">
<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
-<!-- <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>-->
+ <button class="layui-btn layui-btn-sm" id="btn-init" lay-event="init">涓婃姤</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
--
Gitblit v1.9.1