From fc45de2fc49363738d5854446ad2ad33b58b1949 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 15 十二月 2023 16:33:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/MatPrint.java | 13 ++++++++++++-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 17 ++++++-----------
src/main/java/com/zy/asrs/controller/MatController.java | 5 +++--
src/main/java/com/zy/asrs/controller/MobileController.java | 11 ++++++++++-
src/main/webapp/static/js/locInPrintMat/locInPrintMat.js | 4 ++--
src/main/webapp/views/locInPrintMat/locInPrintMat.html | 10 +++++-----
6 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index b5d0607..d130425 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -287,8 +287,9 @@
print.setMatnr(locInPrintMat.getMatnr());
print.setMaktx(locInPrintMat.getMaktx());
print.setBatch(locInPrintMat.getBatch());
- print.setAnfme(locInPrintMat.getAnfme().toString());
- print.setMemo(locInPrintMat.getMemo());
+ print.setAnfme(locInPrintMat.getAnfme());
+ print.setLocNo(locInPrintMat.getLocNo());
+ print.setId(locInPrintMat.getId());
res.add(print);
locInPrintMat.setUpdateTime(new Date());
locInPrintMat.setUpdateBy(getUserId());
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 77bae09..46ebd80 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -403,9 +403,18 @@
return mobileService.manDetlOrigInNo(json,getUser());
}
+// @RequestMapping("/manDetl/out/origin")
+// @ManagerAuth(memo = "骞冲簱涓嬫灦")
+// public R manDetlout(@RequestBody JSONObject json){
+// if (json == null){
+// return R.error("浼犲叆鏁版嵁涓虹┖");
+// }
+// return mobileService.manDetlOriginOut(json,getUser());
+// }
+
@RequestMapping("/manDetl/out/origin")
@ManagerAuth(memo = "骞冲簱涓嬫灦")
- public R manDetlout(@RequestBody JSONObject json){
+ public R manDetlout2(@RequestBody JSONObject json){
if (json == null){
return R.error("浼犲叆鏁版嵁涓虹┖");
}
diff --git a/src/main/java/com/zy/asrs/entity/MatPrint.java b/src/main/java/com/zy/asrs/entity/MatPrint.java
index 2d5640a..53981de 100644
--- a/src/main/java/com/zy/asrs/entity/MatPrint.java
+++ b/src/main/java/com/zy/asrs/entity/MatPrint.java
@@ -41,7 +41,18 @@
/**
* 鏁伴噺
*/
- private String anfme;
+ private Double anfme;
+
+
+ /**
+ * 搴撲綅鍙�
+ */
+ private String locNo;
+
+ /**
+ * 搴撲綅鍙�
+ */
+ private Long id;
/**
* 澶囨敞
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 039df1b..edda824 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1106,24 +1106,21 @@
@Override
public R manDetlOriginOut(JSONObject json, User user) {
- String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
-
JSONArray combMats = json.getJSONArray("combMats");
for (int i = 0; i < combMats.size(); i++) {
- OrderDetl jsonOriginDetl = combMats.getObject(i, OrderDetl.class);
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch());
+ MatPrint jsonOriginDetl = combMats.getObject(i, MatPrint.class);
+ Double parseLong = jsonOriginDetl.getAnfme();
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonOriginDetl.getLocNo()).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch());
ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
if (Cools.isEmpty(manLocDetl)){
- return R.error("鏈晢鍝佹槑缁嗕俊鎭�!搴撲綅鍙凤細"+jsonLocNo+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch());
+ return R.error("鏈晢鍝佹槑缁嗕俊鎭�!搴撲綅鍙凤細"+jsonOriginDetl.getLocNo()+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch());
}
- BigDecimal outAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+ BigDecimal outAnfme = BigDecimal.valueOf(parseLong);
BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());
- if (manLocDetl.getAnfme() > jsonOriginDetl.getAnfme()){
+ if (manLocDetl.getAnfme() > parseLong){
BigDecimal num = anfme.subtract(outAnfme);
manLocDetl.setAnfme(num.doubleValue());
-
-
if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)) {
return R.error("鐗╂枡淇℃伅涓嬫灦澶辫触");
}
@@ -1133,8 +1130,6 @@
return R.error("鐗╂枡淇℃伅鍒犻櫎澶辫触");
}
}
-
-
}
return R.ok();
}
diff --git a/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js b/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
index 64a1890..a07c9d5 100644
--- a/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
+++ b/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
@@ -274,9 +274,9 @@
var templateDom = $("#templatePreview"+templateNo);
var className = templateDom.attr("class");
if (className === 'template-barcode') {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].memo+";"+res.data[i].maktx;
+ res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].locNo+";"+res.data[i].maktx+";"+res.data[i].id;
} else {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].memo+";"+res.data[i].maktx;
+ res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].locNo+";"+res.data[i].maktx+";"+res.data[i].id;
}
}
var tpl = templateDom.html();
diff --git a/src/main/webapp/views/locInPrintMat/locInPrintMat.html b/src/main/webapp/views/locInPrintMat/locInPrintMat.html
index fbf9ac6..4464d21 100644
--- a/src/main/webapp/views/locInPrintMat/locInPrintMat.html
+++ b/src/main/webapp/views/locInPrintMat/locInPrintMat.html
@@ -95,7 +95,7 @@
<script type="text/html" id="toolbar">
<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-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
@@ -335,12 +335,12 @@
<td colspan="2"><strong>{{this.batch}}</strong></td>
</tr>
<tr>
- <th>鏁伴噺</th>
- <td colspan="2"><strong>{{this.anfme}}</strong></td>
+ <th>閲嶉噺</th>
+ <td colspan="2"><strong>{{this.anfme}}kg</strong></td>
</tr>
<tr>
- <th>澶囨敞</th>
- <td colspan="2"><strong>{{this.memo}}</strong></td>
+ <th>搴撲綅</th>
+ <td colspan="2"><strong>{{this.locNo}}</strong></td>
</tr>
</table>
{{/each}}
--
Gitblit v1.9.1