From ce0fcdaf2629e5b6ebef0f206b16ecad103e5c1e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 05 五月 2025 14:39:06 +0800
Subject: [PATCH] #盘点上报
---
src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java | 26 ++++++------
src/main/webapp/views/locDetlStatis/check.html | 5 ++
src/main/resources/mapper/LocDetlMapper.xml | 13 +++++-
src/main/webapp/static/js/locDetlStatis/check.js | 3 +
src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java | 6 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 +
src/main/resources/mapper/CheckDetlMapper.xml | 1
src/main/resources/application.yml | 21 ++++++++--
src/main/java/com/zy/asrs/entity/CheckDetl.java | 4 ++
9 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/CheckDetl.java b/src/main/java/com/zy/asrs/entity/CheckDetl.java
index 369bad0..2b1fdb1 100644
--- a/src/main/java/com/zy/asrs/entity/CheckDetl.java
+++ b/src/main/java/com/zy/asrs/entity/CheckDetl.java
@@ -30,6 +30,10 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
+ @ApiModelProperty(value= "鐩樼偣鏁伴噺")
+ @ExcelProperty("鐩樼偣鏁伴噺")
+ private Double number;
+
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
@ExcelProperty("鍟嗗搧缂栧彿")
private String matnr;
diff --git a/src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java
index 74680a8..b2e31d1 100644
--- a/src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.CheckDetl;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.CheckDetlMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CheckDetlService;
@@ -27,12 +28,11 @@
@Service
@Slf4j
public class CheckDetlServiceImpl extends ServiceImpl<CheckDetlMapper, CheckDetl> implements CheckDetlService {
- @Value("${erp.address.URL}")
+ @Value("${erp.newaddress.UPLOADURL}")
//绔彛
private String URL;
- @Value("${erp.address.outaddressSubmit}")
- //涓婃姤鍑哄叆搴撳湴鍧�
- private String outaddressSubmit;
+ @Value("${erp.newaddress.uploadaddressSubmit}")
+ private String uploadAddress;
@Autowired
private CheckDetlService checkDetlService;
@Autowired
@@ -47,18 +47,23 @@
public void upload(List<CheckDetl> list) {
Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+
// 鏋勫缓涓诲崟 JSON 鏁版嵁
JSONObject requestBody = new JSONObject();
- requestBody.put("createTime", sdf.format(now));
+ if (!list.isEmpty()) {
+ CheckDetl first = list.get(0);
+ requestBody.put("orderNo", first.getOrderNo());
+ }
// 鏋勫缓鐗╂枡鍒楄〃
JSONArray matList = new JSONArray();
for(CheckDetl checkDetl : list) {
JSONObject mat = new JSONObject();
mat.put("detailId", checkDetl.getDetailId());
- mat.put("orderNo", checkDetl.getOrderNo());
mat.put("matnr", checkDetl.getMatnr());
mat.put("anfme", checkDetl.getAnfme());
+ mat.put("number", checkDetl.getNumber());
matList.add(mat);
}
requestBody.put("data", matList);
@@ -66,14 +71,9 @@
String response = "";
boolean success = false;
try {
- HashMap<String, Object> headers = new HashMap<>();
- // cookie
- headers.put("Cookie", loginAuthenticationHandler.start().getContent());
-
response = new HttpHandler.Builder()
- .setHeaders(headers)
.setUri(URL)
- .setPath(outaddressSubmit) // 璁剧疆浣犵殑鎺ュ彛璺緞
+ .setPath(uploadAddress) // 璁剧疆浣犵殑鎺ュ彛璺緞
.setJson(requestBody.toJSONString())
.build()
.doPost();
@@ -91,7 +91,7 @@
try {
apiLogService.save(
"鐩樼偣涓婃姤",
- URL + outaddressSubmit,
+ URL + uploadAddress,
null,
"127.0.0.1",
requestBody.toJSONString(),
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 5cb108a..d0bba2e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -635,7 +635,8 @@
if (diff != 0) {
CheckDetl checkDetl = new CheckDetl();
checkDetl.setOrderNo(param.getOrderNo());
- checkDetl.setAnfme(diff); //杩欓噷璁板綍宸��
+ checkDetl.setAnfme(matParam.getAnfme()); //璐﹂潰鏁伴噺
+ checkDetl.setNumber(LKAnfme);
checkDetl.setMatnr(matParam.getMatnr());
checkDetl.setMaktx(matParam.getMaktx());
checkDetl.setSpecs(matParam.getSpecs());
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
index 3530b48..e6bf092 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
@@ -33,15 +33,15 @@
//鐧诲綍鍦板潃
private String loginaddress;
- @Value("${erp.login.acctID}")
+ @Value("${erp.login.sAcctID}")
//璐﹀彿ID
private String acctID;
- @Value("${erp.login.username}")
+ @Value("${erp.login.sUserId}")
//璐﹀彿
private String username;
- @Value("${erp.login.password}")
+ @Value("${erp.login.sPassword}")
//瀵嗙爜
private String password;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e23b1b9..c2ed14c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -94,9 +94,22 @@
outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
#缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
+ # 鍦板潃
+ newaddress:
+ #鍗曟嵁涓婃姤鍦板潃
+ URL: http://10.10.0.59:33117
+ #鍗曟嵁鎻愪氦
+ orderaddressSubmit: api/U8Voucher
+ #鐩樼偣涓婃姤鍦板潃
+ UPLOADURL: http://10.10.0.10:2501
+ # 鐩樼偣鍦板潃
+ uploadaddressSubmit: api/CheckVouch/pypk
+
+
# 鐧诲綍璐﹀彿绠＄悊
login :
- acctID: "647e849ab6fa0f"
- username: "llw"
- password: "666666"
- lcid: 2052
\ No newline at end of file
+ sAcctID: "999"
+ sUserId: "demo"
+ sPassword: "DEMO"
+ sServer: "10.1.9.20"
+ lcid: 1234
diff --git a/src/main/resources/mapper/CheckDetlMapper.xml b/src/main/resources/mapper/CheckDetlMapper.xml
index 2ba470f..e96d878 100644
--- a/src/main/resources/mapper/CheckDetlMapper.xml
+++ b/src/main/resources/mapper/CheckDetlMapper.xml
@@ -8,6 +8,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.CheckDetl">
<result column="anfme" property="anfme"/>
+ <result column="number" property="number"/>
<result column="matnr" property="matnr"/>
<result column="maktx" property="maktx"/>
<result column="specs" property="specs"/>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3db9eab..0856ec3 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -48,12 +48,14 @@
<resultMap id="CheckResultMap" type="com.zy.asrs.entity.CheckDetl">
<result column="anfme" property="anfme" />
+ <result column="number" property="number"/>
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
<result column="specs" property="specs" />
<result column="batch" property="batch" />
<result column="create_time" property="createTime"/>
<result column="order_no" property="orderNo"/>
+ <result column="detail_id" property="detailId"/>
</resultMap>
<sql id="batchSeq">
@@ -119,8 +121,11 @@
<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 test="orderNo!=null and orderNo!='' ">
+ and a.order_no like '%' + #{orderNo} + '%'
+ </if>
+ <if test="detail_id!=null and detail_id!='' ">
+ and a.detail_id like '%' + #{detail_id} + '%'
</if>
</sql>
@@ -188,7 +193,9 @@
a.specs,
a.batch,
a.create_time,
- a.order_no
+ a.order_no,
+ a.detail_id,
+ a.number
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 db84427..21c4b8d 100644
--- a/src/main/webapp/static/js/locDetlStatis/check.js
+++ b/src/main/webapp/static/js/locDetlStatis/check.js
@@ -21,7 +21,8 @@
cols: [[
{type: 'checkbox'},
{field: 'orderNo', align: 'center',title: '鐩樼偣鍗曠紪鍙�', style: 'font-weight: bold'},
- {field: 'anfme', align: 'center',title: '鐩樼偣鐩堜簭', style: 'font-weight: bold'},
+ {field: 'anfme', align: 'center',title: '璐﹂潰鏁伴噺', style: 'font-weight: bold'},
+ {field: 'number', 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'},
{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', style: 'font-weight: bold'},
diff --git a/src/main/webapp/views/locDetlStatis/check.html b/src/main/webapp/views/locDetlStatis/check.html
index 0739a1f..c483aeb 100644
--- a/src/main/webapp/views/locDetlStatis/check.html
+++ b/src/main/webapp/views/locDetlStatis/check.html
@@ -19,6 +19,11 @@
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="orderNo" placeholder="鐩樼偣缂栧彿" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储
--
Gitblit v1.9.1