From 7578bc1bc60fe8cbed874733ad7c5dce133f57ce Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 10:27:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocInPrintMat.java | 18 +++++
src/main/java/com/zy/asrs/entity/MatPrint.java | 10 +++
src/main/resources/mapper/LocInPrintMatMapper.xml | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 34 +++++++++-
src/main/java/com/zy/asrs/controller/MatController.java | 2
src/main/webapp/static/js/locInPrintMat/locInPrintMat.js | 13 +++
src/main/java/com/zy/asrs/controller/LocInPrintMatController.java | 6 ++
src/main/webapp/views/locInPrintMat/locInPrintMat.html | 36 +++++++++++
8 files changed, 112 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java b/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
index ec0ecca..6ff8bce 100644
--- a/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
+++ b/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
@@ -65,6 +65,12 @@
@RequestMapping(value = "/locInPrintMat/add/auth")
@ManagerAuth
public R add(LocInPrintMat locInPrintMat) {
+ Date now = new Date();
+ locInPrintMat.setUuid(String.valueOf(now.getTime()));
+ locInPrintMat.setUpdateTime(now);
+ locInPrintMat.setCreateBy(getUserId());
+ locInPrintMat.setUpdateTime(now);
+ locInPrintMat.setUpdateBy(getUserId());
locInPrintMatService.insert(locInPrintMat);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index d130425..3c0ef82 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -289,6 +289,8 @@
print.setBatch(locInPrintMat.getBatch());
print.setAnfme(locInPrintMat.getAnfme());
print.setLocNo(locInPrintMat.getLocNo());
+ print.setOwnerId(locInPrintMat.getOwnerId());
+ print.setOwner(locInPrintMat.getOwner$());
print.setId(locInPrintMat.getId());
res.add(print);
locInPrintMat.setUpdateTime(new Date());
diff --git a/src/main/java/com/zy/asrs/entity/LocInPrintMat.java b/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
index 07be576..072f075 100644
--- a/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
+++ b/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
@@ -5,6 +5,7 @@
import com.core.common.Cools;import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.asrs.service.LocOwnerService;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -112,6 +113,12 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ private Long ownerId;
+
public LocInPrintMat() {}
public LocInPrintMat(String uuid,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,Double anfme,String locNo,String maktx) {
@@ -130,7 +137,7 @@
}
public LocInPrintMat(Date now,Long userId,String matnr,String batch,Double anfme,String locNo,String maktx) {
- this.uuid = now.toString();
+ this.uuid = String.valueOf(now.getTime());
this.createTime = now;
this.createBy = userId;
// this.updateTime = now;
@@ -185,6 +192,15 @@
return null;
}
+ public String getOwner$(){
+ LocOwnerService locOwnerService = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = locOwnerService.selectById(this.ownerId);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/MatPrint.java b/src/main/java/com/zy/asrs/entity/MatPrint.java
index 53981de..3fb1dc5 100644
--- a/src/main/java/com/zy/asrs/entity/MatPrint.java
+++ b/src/main/java/com/zy/asrs/entity/MatPrint.java
@@ -55,6 +55,16 @@
private Long id;
/**
+ * 璐т富鍙�
+ */
+ private Long ownerId;
+
+ /**
+ * 璐т富
+ */
+ private String owner;
+
+ /**
* 澶囨敞
*/
private String memo;
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 edda824..f2dc84f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -962,8 +962,19 @@
public R manDetlOrigin(JSONObject json, User user) {
Date now = new Date();
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+ Long ownerId = (Long) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
String jsonCode = (String) json.get("code"); //鑾峰彇鏉＄爜
String jsonOrigin = (String) json.get("origin"); //鑾峰彇鏉ユ簮鍦�
+ if (Cools.isEmpty(jsonLocNo)){
+ return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(ownerId)){
+ return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(jsonCode)){
+ return R.error("鏉＄爜鍙傛暟涓虹┖锛�");
+ }else if (Cools.isEmpty(jsonOrigin)){
+ return R.error("鏉ユ簮鍦板弬鏁颁负绌猴紒");
+ }
+ Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
OriginRule originRule = originRuleService.selectOne(new EntityWrapper<OriginRule>()
.eq("origin_address", jsonOrigin));
@@ -998,9 +1009,11 @@
}
//澧炲姞鎵撳嵃妗ｆ
LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
+ locInPrintMat.setOwnerId(ownerId);
locInPrintMatService.insert(locInPrintMat);
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date);
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date).eq("owner",jsonOwner);
ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
if(!Cools.isEmpty(manLocDetl1)){
BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1031,6 +1044,7 @@
manLocDetl.setModiTime(now);
// manLocDetl.setOrderNo(waitPakin.getOrderNo());
manLocDetl.setStockFreeze(1);
+ manLocDetl.setOwner(jsonOwner);
if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -1045,7 +1059,13 @@
public R manDetlOrigInNo(JSONObject json, User user) {
Date now = new Date();
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
-
+ Long ownerId = (Long) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+ if (Cools.isEmpty(jsonLocNo)){
+ return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(ownerId)){
+ return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+ }
+ Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
if (Cools.isEmpty(node)){
return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
@@ -1061,9 +1081,11 @@
}
//澧炲姞鎵撳嵃妗ｆ
LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
+ locInPrintMat.setOwnerId(ownerId);
locInPrintMatService.insert(locInPrintMat);
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch());
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch()).eq("owner",jsonOwner);
ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
if(!Cools.isEmpty(manLocDetl1)){
BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1092,6 +1114,7 @@
manLocDetl.setCreateTime(now);
manLocDetl.setUpdateBy(user.getId());
manLocDetl.setModiTime(now);
+ manLocDetl.setOwner(jsonOwner);
// manLocDetl.setOrderNo(waitPakin.getOrderNo());
manLocDetl.setStockFreeze(1);
@@ -1110,10 +1133,11 @@
for (int i = 0; i < combMats.size(); i++) {
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());
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonOriginDetl.getLocNo())
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch()).eq("owner",jsonOriginDetl.getOwnerId());
ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
if (Cools.isEmpty(manLocDetl)){
- return R.error("鏈晢鍝佹槑缁嗕俊鎭�!搴撲綅鍙凤細"+jsonOriginDetl.getLocNo()+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch());
+ return R.error("鏈煡璇㈠埌鍟嗗搧鏄庣粏淇℃伅!搴撲綅鍙凤細"+jsonOriginDetl.getLocNo()+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch()+"璐т富"+jsonOriginDetl.getOwnerId());
}
BigDecimal outAnfme = BigDecimal.valueOf(parseLong);
BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());
diff --git a/src/main/resources/mapper/LocInPrintMatMapper.xml b/src/main/resources/mapper/LocInPrintMatMapper.xml
index c5be522..6cca31b 100644
--- a/src/main/resources/mapper/LocInPrintMatMapper.xml
+++ b/src/main/resources/mapper/LocInPrintMatMapper.xml
@@ -17,6 +17,8 @@
<result column="anfme" property="anfme" />
<result column="loc_no" property="locNo" />
<result column="maktx" property="maktx" />
+ <result column="owner_id" property="ownerId" />
+ <result column="owner" property="owner" />
</resultMap>
diff --git a/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js b/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
index a07c9d5..c86a99a 100644
--- a/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
+++ b/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
@@ -30,6 +30,7 @@
,{field: 'anfme', align: 'center',title: '閲嶉噺(kg)', width:100,hide: false}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', width:120,hide: false}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О',hide: false}
+ ,{field: 'owner$', align: 'center',title: '璐т富',hide: false}
,{field: 'createTime$', align: 'center',title: '鍏ュ簱鏃堕棿', width:120,hide: false}
,{field: 'createBy$', align: 'center',title: '鍏ュ簱浜哄憳', width:100,hide: false}
,{field: 'updateTime$', align: 'center',title: '鎵撳嵃鏃堕棿', width:120,hide: false}
@@ -274,9 +275,17 @@
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].locNo+";"+res.data[i].maktx+";"+res.data[i].id;
+ 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].ownerId+";"+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].locNo+";"+res.data[i].maktx+";"+res.data[i].id;
+ 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].ownerId+";"+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 4464d21..bc4d442 100644
--- a/src/main/webapp/views/locInPrintMat/locInPrintMat.html
+++ b/src/main/webapp/views/locInPrintMat/locInPrintMat.html
@@ -53,6 +53,25 @@
color: black;
}
+ #templatePreview3 {
+ color: black;
+ border-color: black;
+ border-collapse: collapse; /* 鎶樺彔杈规 */
+ }
+
+ /* 灏嗘牱寮忓彧搴旂敤鍒板叿鏈夌壒瀹歩d鐨則able銆乼h銆乼d */
+ #templatePreview3, #myTable th, #myTable td {
+ color: black;
+ border: 2px solid black; /* 2鍍忕礌榛戣壊杈规 */
+ }
+
+ #templatePreview3 th, #myTable td {
+ color: black;
+ border-color: black;
+ text-align: left;
+ padding: 8px;
+ }
+
</style>
</head>
<body>
@@ -78,6 +97,11 @@
</select>
</div>
</div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="ownerId" placeholder="璐т富" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
@@ -132,6 +156,12 @@
<option value="1">鏈墦鍗�</option>
<option value="2">宸叉墦鍗�</option>
</select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐т富缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="owner" placeholder="璇疯緭鍏ヨ揣涓荤紪鍙�">
</div>
</div>
<div class="layui-form-item">
@@ -327,7 +357,7 @@
<td colspan="2"><strong>{{this.maktx}}</strong></td>
<td colspan="3" rowspan="4" class="barcode-section" style="white-space: normal; ">
<img class="template-code template-qrcode" src="{{this.barcodeUrl}}" alt="Barcode Image">
- <div><span >{{this.matnr}}</span></div>
+ <div><span >{{this.owner}}</span></div>
</td>
</tr>
<tr>
@@ -342,6 +372,10 @@
<th>搴撲綅</th>
<td colspan="2"><strong>{{this.locNo}}</strong></td>
</tr>
+ <tr>
+ <th>鍝佸彿</th>
+ <td colspan="5"><strong>{{this.matnr}}</strong></td>
+ </tr>
</table>
{{/each}}
</script>
--
Gitblit v1.9.1