From c356df1cf4272db8792ccda3f0a48364b3b9f83c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 20 七月 2023 09:14:01 +0800
Subject: [PATCH] #贴标机申请获取货物信息接口实装
---
src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java | 4
src/main/java/com/zy/asrs/controller/OpenController.java | 25 +++---
src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java | 4
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java | 4
src/main/webapp/static/js/apiLog/apiLog.js | 14 +-
src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java | 4
src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java | 45 ++++++++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 85 +++++++++++++++++++-
src/main/java/com/zy/asrs/service/OpenService.java | 4
src/main/resources/application.yml | 2
10 files changed, 148 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 77075c9..a37f3c6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -191,7 +191,19 @@
/*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+ /**
+ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ */
+ @PostMapping("/labeller/mat/auth/v1")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
+ public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.labellerMat(param));
+ }
/**
* 璐存爣鏈鸿创鏍囧畬鎴�
@@ -203,19 +215,6 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.labellerComplete(param);
- return R.ok(param);
- }
-
- /**
- * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
- */
- @PostMapping("/labeller/mat/auth/v1")
- @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
- public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
- @RequestBody LabellerMatParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.labellerMat(param);
return R.ok(param);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java
index 2d19119..8294676 100644
--- a/src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java
@@ -1,7 +1,9 @@
package com.zy.asrs.entity.param;
import lombok.Data;
-
+/*
+ * Created by Monkey D. Luffy on 2023.07.19
+ * */
@Data
public class LabellerCompleteParam {
private Integer devNo; // 鏄� int 绔欑偣鍙�
diff --git a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
index 4d48a87..a24c97d 100644
--- a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
@@ -1,7 +1,13 @@
package com.zy.asrs.entity.param;
+import com.zy.asrs.entity.WrkDetl;
import lombok.Data;
+import java.util.List;
+
+/*
+ * Created by Monkey D. Luffy on 2023.07.19
+ * */
@Data
public class LabellerMatParam {
@@ -22,14 +28,33 @@
private String WrkNo; // 瀛楃涓� 宸ヤ綔鍙� 锛堣创鏍囨満淇濆瓨锛岃创鏍囧畬鎴愯姹傞檮甯︼級
private String orderNo; // 瀛楃涓� 璁㈠崟鍙�
private String labellingTime; // 瀛楃涓� 璐存爣鏃ユ湡 yyyy-MM-dd HH:mm:ss
- private String matnr; // 瀛楃涓� 鍟嗗搧缂栧彿
- private String maktx; // 瀛楃涓� 鍟嗗搧鍚嶇О
- private String specs; // 瀛楃涓� 瑙勬牸
- private String batch; // 瀛楃涓� 鎵规
- private String unit ; //瀛楃涓� 鍗曚綅
- private String anfme; // 瀛楃涓� 鏁伴噺
- private String temp1; // 瀛楃涓� 澶囩敤
- private String temp2; // 瀛楃涓� 澶囩敤
- private String temp3; // 瀛楃涓� 澶囩敤
- private String temp4; // 瀛楃涓� 澶囩敤
+
+ private List<CombMat> combMats;
+
+
+ @Data
+ public static class CombMat{
+ private String matnr; // 瀛楃涓� 鍟嗗搧缂栧彿
+ private String maktx; // 瀛楃涓� 鍟嗗搧鍚嶇О
+ private String specs; // 瀛楃涓� 瑙勬牸
+ private String batch; // 瀛楃涓� 鎵规
+ private String unit ; //瀛楃涓� 鍗曚綅
+ private String anfme; // 瀛楃涓� 鏁伴噺
+
+ private String temp1; // 瀛楃涓� 澶囩敤
+ private String temp2; // 瀛楃涓� 澶囩敤
+ private String temp3; // 瀛楃涓� 澶囩敤
+ private String temp4; // 瀛楃涓� 澶囩敤
+
+ public CombMat(){}
+
+ public CombMat(WrkDetl wrkDetl){
+ this.matnr = wrkDetl.getMatnr();
+ this.maktx = wrkDetl.getMaktx();
+ this.specs = wrkDetl.getSpecs();
+ this.batch = wrkDetl.getBatch();
+ this.unit = wrkDetl.getUnit();
+ this.anfme = wrkDetl.getAnfme().toString();
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
index a77d4cf..44fc614 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
@@ -3,7 +3,9 @@
import lombok.Data;
import java.util.List;
-
+/*
+ * Created by Monkey D. Luffy on 2023.07.19
+ * */
@Data
public class PalletizingCompleteParam {
diff --git a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
index 36c0906..1c58411 100644
--- a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
@@ -3,7 +3,9 @@
import lombok.Data;
import java.util.List;
-
+/*
+ * Created by Monkey D. Luffy on 2023.07.19
+ * */
@Data
public class SingleMountUnstackingCompleteParam {
private String barcode;// 鏄� 瀛楃涓� 鎵樼洏鐮�
diff --git a/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
index 2fbca79..b2536c9 100644
--- a/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
@@ -3,7 +3,9 @@
import lombok.Data;
import java.util.List;
-
+/*
+ * Created by Monkey D. Luffy on 2023.07.19
+ * */
@Data
public class SingleUnstackingCompleteParam {
private String barcode;// 鏄� 瀛楃涓� 鎵樼洏鐮�
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 7eb3b75..21116e1 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -44,9 +44,9 @@
*/
void syncMat(MatSyncParam param);
- void labellerComplete(LabellerCompleteParam param);
+ LabellerMatParam labellerMat(LabellerMatParam param);
- void labellerMat(LabellerMatParam param);
+ void labellerComplete(LabellerCompleteParam param);
void palletizingComplete(PalletizingCompleteParam param);
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 b0aad34..c55bc31 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -48,6 +48,12 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
@Override
@Transactional
@@ -543,31 +549,98 @@
}
}
+
+ /*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+
+ /*
+ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ * */
+ @Override
+ @Transactional
+ public LabellerMatParam labellerMat(LabellerMatParam param){
+ if (Cools.isEmpty(param.getDevNo())){
+ throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓虹┖");
+ }else if (Cools.isEmpty(param.getLabNo())){
+ throw new CoolException("鍙傛暟锛氳创鏍囨満鍙� labNo涓虹┖");
+ }
+ BasDevp basDevp = basDevpService.selectById(param.getDevNo());
+ if (Cools.isEmpty(basDevp)){
+ throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓嶅瓨鍦�");
+ }else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 涓嶅瓨鍦ㄥ伐浣滀腑浠诲姟");
+ }
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkMast)){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪,浠诲姟鍙凤細"+basDevp.getWrkNo());
+ }else if (!wrkMast.getWrkSts().equals(52L)){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔＄姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪浠诲姟鏄庣粏,浠诲姟鍙凤細"+basDevp.getWrkNo());
+ }
+
+ LabellerMatParam labellerMatParam = new LabellerMatParam();
+ labellerMatParam.setDevNo(param.getDevNo());
+ labellerMatParam.setLabNo(param.getLabNo());
+ ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
+ String orderNo = "";
+ for (WrkDetl wrkDetl:wrkDetls){
+ LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
+ orderNo=wrkDetl.getOrderNo();
+ combMat.setTemp1("1");
+ combMats.add(combMat);
+ }
+ labellerMatParam.setCombMats(combMats);
+ labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
+ labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
+ labellerMatParam.setLabTemplate("1");
+ labellerMatParam.setOrderNo(orderNo);
+ wrkMast.setWrkSts(53L);
+ if (!wrkMastService.updateById(wrkMast)){
+ throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+ }
+ return labellerMatParam;
+ }
+
+ /*
+ * 璐存爣鏈鸿创鏍囧畬鎴�
+ * */
@Override
@Transactional
public void labellerComplete(LabellerCompleteParam param) {
-
+ //
}
- @Override
- @Transactional
- public void labellerMat(LabellerMatParam param){
- }
+ /*
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * */
@Override
@Transactional
public void palletizingComplete(PalletizingCompleteParam param) {
}
+
+ /*
+ * 妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡
+ * */
@Override
@Transactional
public void singleUnstackingComplete(SingleUnstackingCompleteParam param) {
}
+
+ /*
+ * 妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡
+ * */
@Override
@Transactional
public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
}
-
+ /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1d36cb3..04fd4a7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=sxlktasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/apiLog/apiLog.js b/src/main/webapp/static/js/apiLog/apiLog.js
index f406a18..02de196 100644
--- a/src/main/webapp/static/js/apiLog/apiLog.js
+++ b/src/main/webapp/static/js/apiLog/apiLog.js
@@ -24,17 +24,17 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '鏃ュ織缂栧彿'}
- ,{field: 'namespace', align: 'center',title: '鍚嶇О绌洪棿'}
- ,{field: 'url', align: 'center',title: '琛ㄥ悕'}
+ ,{field: 'namespace', align: 'center',title: '鍚嶇О绌洪棿',hide: false}
+ ,{field: 'url', align: 'center',title: 'url',hide: true}
,{field: 'appkey', align: 'center',title: '骞冲彴瀵嗛挜',hide: true}
// ,{field: 'timestamp', align: 'center',title: '鏃堕棿鎴�'}
- ,{field: 'clientIp', align: 'center',title: '涓棿琛↖P'}
- ,{field: 'request', align: 'center',title: '璇锋眰鍐呭'}
- ,{field: 'response', align: 'center',title: '鎿嶄綔鍐呭'}
+ ,{field: 'clientIp', align: 'center',title: 'IP',hide: true}
+ ,{field: 'request', align: 'center',title: '璇锋眰鍐呭',hide: false}
+ ,{field: 'response', align: 'center',title: '杩斿洖鍐呭',hide: false}
// ,{field: 'err', align: 'center',title: '寮傚父鍐呭'}
- ,{field: 'result$', align: 'center',title: '缁撴灉', templet: '#resTpl', width: 80}
+ ,{field: 'result$', align: 'center',title: '缁撴灉', templet: '#resTpl', width: 80,hide: false}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide: false}
// ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
--
Gitblit v1.9.1