From 30eec1f6c7424fa5864b7f04abc55683071133e7 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期六, 13 八月 2022 10:32:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 87 +++++---
src/main/resources/mapper/LocMastMapper.xml | 3
src/main/java/com/zy/asrs/controller/MobileController.java | 28 +++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 124 +++++++++++--
src/main/webapp/static/js/stoMan/stoQue.js | 16 +
src/main/java/com/zy/asrs/entity/param/Review.java | 17 +
src/main/java/com/zy/asrs/service/OpenService.java | 17 +
src/main/webapp/views/locMast/locMast_detail.html | 23 ++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 52 +++++
src/main/webapp/static/js/common.js | 2
src/main/webapp/static/js/locMast/locMast.js | 20 +
src/main/java/com/zy/asrs/entity/LocMast.java | 45 +++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 41 ++++
src/main/resources/application.yml | 8
src/main/java/com/zy/asrs/service/MobileService.java | 6
15 files changed, 407 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index a59f8bb..7508ecd 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,11 +1,13 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -13,12 +15,16 @@
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
+import com.zy.asrs.task.handler.WorkLogHandler;
+import com.zy.common.constant.MesConstant;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.model.WrkDto;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -318,4 +324,26 @@
return R.ok("鍑哄簱鎴愬姛");
}
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ @PostMapping("/test/startUp/auth")
+// @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
+ public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
+ if (Cools.isEmpty(testMast)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ //鎻愪氦娴嬭瘯绯荤粺
+ mobileService.startUpTestPACK(testMast);
+
+ return R.ok();
+ }
+ @PostMapping("/test/suspend/auth")
+ @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
+ public synchronized R suspendTestPACK() {
+ mobileService.suspendTestPACK();
+ return R.ok();
+ }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
+
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 498d446..be9b3b4 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,6 +4,7 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
@@ -44,40 +45,6 @@
return R.ok();
}
- @PostMapping("/rpc/watchDog/auth/v1")
- @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
- public synchronized R hostName(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) HeartBeat param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
-
- //........
- System.out.println(String.format("id:%s,hostName:%s,requestTime:%s",
- param.getId(),param.getHostName(),param.getRequestTime()));
-
- return R.ok();
- }
- @PostMapping("/rcp/pakIn/auth/v1")
- @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
- public synchronized R combPack(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) CombParam param,
- HttpServletRequest request){
-
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- //鐢熸垚鍏ュ簱閫氱煡妗�
- openService.combPACK(param);
-
- Map<String,Boolean> map=new HashMap<>();
- map.put("isComplete",true);
- System.out.println(map);
- return R.ok(map);
- }
/****************************************************************************/
/********************************* 鎵撳寘涓婄嚎 **********************************/
/****************************************************************************/
@@ -236,4 +203,56 @@
System.out.println(JSON.toJSONString(param1));
}
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ @PostMapping("/rpc/watchDog/auth/v1")
+ @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
+ public synchronized R hostName(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) HeartBeat param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ //........
+ System.out.println(String.format("id:%s,hostName:%s,requestTime:%s",
+ param.getId(),param.getHostName(),param.getRequestTime()));
+
+ return R.ok();
+ }
+
+ @PostMapping("/rcp/pakIn/auth/v1")
+ @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+ public synchronized R combPack(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) CombParam param,
+ HttpServletRequest request){
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ //鐢熸垚鍏ュ簱閫氱煡妗�
+ openService.combPACK(param);
+
+ Map<String,Boolean> map=new HashMap<>();
+ map.put("isComplete",true);
+ return R.ok(map);
+ }
+
+ @PostMapping("/rpv/infoReview/auth/v1")
+ @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
+ public synchronized R infoReview(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Review param,
+ HttpServletRequest request){
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.infoReview(param);
+
+ return R.ok();
+ }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..51bfdb0 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -176,6 +176,21 @@
@TableField("ctn_no")
private String ctnNo;
+// 娑堥槻鐐圭紪鍙�
+ @ApiModelProperty(value= "")
+ @TableField("fire_no")
+ private String fireNo;
+
+// 娑堥槻鐘舵�亄0:姝ｅ父,1:鎶ヨ}
+ @ApiModelProperty(value= "")
+ @TableField("fire_status")
+ private Integer fireStatus;
+
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}
+ @ApiModelProperty(value= "")
+ @TableField("pack_status")
+ private Integer packStatus;
+
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -290,4 +305,34 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getFireStatus$() {
+ if (null == this.fireStatus){ return null; }
+ switch (this.fireStatus){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "鎶ヨ";
+ default:
+ return String.valueOf(this.fireStatus);
+ }
+ }
+
+ public String getPackStatus$() {
+ if (null == this.packStatus){ return null; }
+ switch (this.packStatus){
+ case 0:
+ return "鏃�";
+ case 1:
+ return "寰呮祴";
+ case 2:
+ return "娴嬭瘯涓�";
+ case 3:
+ return "闈欑疆涓�";
+ case 4:
+ return "闈欑疆瀹屾垚";
+ default:
+ return String.valueOf(this.packStatus);
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/Review.java b/src/main/java/com/zy/asrs/entity/param/Review.java
new file mode 100644
index 0000000..1c82d66
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/Review.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class Review {
+// 搴撲綅鍙�
+ private String locNo;
+// 鐢ㄦ埛鐮�
+ private String userId;
+// PACK鏉＄爜
+ private String barcode;
+// 璇锋眰鏃堕棿, yyyy-MM-dd HH:mm:ss
+ private String requestTime;
+
+ private Boolean pause;
+}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 1dcc010..17435af 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
@@ -32,4 +33,9 @@
void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now);
+
+ //pda鐢宠娴嬭瘯璋冪敤
+ void startUpTestPACK(TestMast testMast);
+ //鏆傚仠娴嬭瘯
+ void suspendTestPACK();
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 3454acb..c76f156 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,17 +1,14 @@
package com.zy.asrs.service;
+import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
public interface OpenService {
-
- /**
- * 娣诲姞鍏ュ簱閫氱煡妗�
- */
- void combPACK(CombParam param);
/**
* 娣诲姞鍏ュ簱鍗�
@@ -48,4 +45,14 @@
* @param param
*/
void syncMat(MatSyncParam param);
+
+ /**
+ * 娣诲姞鍏ュ簱閫氱煡妗�
+ */
+ void combPACK(CombParam param);
+
+ /**
+ * pda娴嬭瘯澶嶆牳璋冪敤鎺ュ彛
+ */
+ void infoReview(Review review);
}
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 c05df4d..3595f89 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -11,6 +12,8 @@
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
@@ -23,6 +26,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.ArrayList;
import java.util.Date;
@@ -73,6 +78,10 @@
private NodeService nodeService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private TestMastService testMastService;
+ @Autowired
+ private WorkLogHandler workLogHandler;
@Override
@@ -592,4 +601,47 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ @Override
+ @Transactional
+ public void startUpTestPACK(TestMast testMast) {
+
+ //鍚姩娴嬭瘯璇锋眰
+ ReturnT<String> result=workLogHandler.startUpTestPACK(testMast);
+ if (!result.isSuccess()) {
+ log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ Date date1;
+ try {
+ date1 = new Date();
+ }catch (Exception e){
+ throw new CoolException("鑾峰彇鏃堕棿澶辫触");
+ }
+ testMast.setChannel(1);
+ testMast.setStatus(1);
+ testMast.setModiTime(date1);
+ testMast.setAppeTime(date1);
+ if (!testMastService.insert(testMast)){
+ throw new CoolException("娣诲姞testMast澶辫触");
+ }
+ locMast.setPackStatus(2);
+ locMast.setModiTime(date1);
+ if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
+ throw new CoolException("鐢宠娴嬭瘯澶辫触");
+ }
+ }
+ @Override
+ @Transactional
+ public void suspendTestPACK() {
+ ReturnT<String> result=workLogHandler.suspendTestPACK();
+ if (!result.isSuccess()) {
+ log.error("娴嬭瘯鐢宠澶辫触");
+ }
+ }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
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 81b1045..76ede1d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -20,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.tools.JavaCompiler;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -55,6 +57,10 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private TestMastService testMastService;
+ @Autowired
+ private LocMastService locMastService;
@Override
@Transactional
@@ -551,6 +557,7 @@
}
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@Override
@Transactional
public void combPACK(CombParam param) {
@@ -570,13 +577,13 @@
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- java.util.Date date=null;
+ java.util.Date date1=null;
try {
- date= sdf.parse(param.getRequestTime());
+ date1= sdf.parse(param.getRequestTime());
} catch (ParseException e) {
e.printStackTrace();
}
- java.sql.Date requestTime = new java.sql.Date(date.getTime());
+ java.sql.Date requestTime = new java.sql.Date(date1.getTime());
// 鐢熸垚鍏ュ簱閫氱煡妗�
Mat mat = matService.selectByMatnr(param.getPackName());
@@ -598,4 +605,32 @@
}
}
+ @Override
+ @Transactional
+ public void infoReview(Review review) {
+ Wrapper wrapper = new EntityWrapper<TestMast>()
+ .eq("loc_no", review.getLocNo());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
+ if (locMast.getPackStatus()!=1){
+ throw new CoolException("浜у搧鐘舵�佷笉鏄� 1:寰呮祴璇�");
+ }
+ TestMast testMast = testMastService.selectOne(wrapper);
+ if(null != testMast){
+ if (testMast.getStatus()==1){
+ testMast.setStatus(2);
+ testMast.setModiTime(new Date());
+ if (!testMastService.update(testMast,wrapper)){
+
+ }
+ }else if (Cools.isEmpty(testMast.getStatus())){
+ throw new CoolException("鐘舵�佸紓甯�");
+ }else {
+ throw new CoolException("鐘舵�佷笉鏄� 1:鐢宠涓�");
+ }
+ } else {
+ throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ }
+ }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 1ab186d..eeaf75d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -6,12 +6,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.Review;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.MobileServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.constant.MesConstant;
@@ -52,6 +51,10 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private LocMastService locMastService;
+
+ private MobileServiceImpl mobileService;
@Value("${mes.url}")
private String mesUrl;
@@ -62,18 +65,55 @@
@Value("${mes.outPath}")
private String outPath;
+ @Value("${mes.startUpTestPACK}")
+ private String startUpTestPACK;
+
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
-// ReturnT<String> result = null;
-// if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
-// result = postMesData(wrkMast,inpath,1);
-// } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
-// result = postMesData(wrkMast,outPath,2);
-// }
-// if(null != result && !result.isSuccess()){
-// return result;
-// }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ ReturnT<String> result = null;
+ if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+ locMast.setFireStatus(0);
+ locMast.setPackStatus(1);
+ if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()))){
+ throw new CoolException("娑堥槻鐘舵��/浜у搧鐘舵�佹洿鏂板け璐�");
+ }
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if(wrkDetl != null){
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkDetl.getZpallet());
+ combParam.setPackName(wrkDetl.getMatnr());
+ combParam.setLocno(wrkMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ result = postMesData(inpath,1,combParam);
+ }
+ } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
+ locMast.setFireStatus(0);
+ locMast.setPackStatus(0);
+ if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()))){
+ throw new CoolException("娑堥槻鐘舵��/浜у搧鐘舵�佹洿鏂板け璐�");
+ }
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if(wrkDetl != null){
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkDetl.getZpallet());
+ combParam.setPackName(wrkDetl.getMatnr());
+ combParam.setLocno(wrkMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ result = postMesData(outPath,2,combParam);
+ }
+ }
+ if(null != result && !result.isSuccess()){
+ return result;
+ }
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -100,15 +140,10 @@
return SUCCESS;
}
- private ReturnT<String> postMesData(WrkMast wrkMast, String mesPath,int a){
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if(wrkDetl != null){
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getZpallet());
- combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocno(wrkMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setRequestTime(DateUtils.convert(new Date()));
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+
+ private ReturnT<String> postMesData(String mesPath,int a,Object combParam){
+ if(combParam != null){
String response = "";
boolean success = false;
try {
@@ -120,7 +155,18 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- success = true;
+ if (a==4 && a==3){
+ if (jsonObject.getDate("isComplete").equals(true)){
+ success = true;
+ }else if (jsonObject.getDate("isComplete").equals(false)){
+ success = false;
+ }else {
+ log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+ throw new CoolException("杩斿洖鍊煎嚭閿�");
+ }
+ }else {
+ success = true;
+ }
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -146,4 +192,36 @@
}
return SUCCESS;
}
+
+ @Transactional
+ public ReturnT<String> startUpTestPACK(TestMast testMast){
+ try {
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(testMast.getLocNo());
+ combParam.setPackName(testMast.getUserId());
+ combParam.setLocno(testMast.getBarcode());
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(outPath,3,combParam);
+ }catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ }
+ @Transactional
+ public ReturnT<String> suspendTestPACK(){
+ try {
+ Review review=new Review();
+ review.setPause(true);
+ review.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(outPath,4,review);
+ }catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e3660c4..7140c5e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -52,5 +52,11 @@
mes:
url: 127.0.0.1:8080/test
+ # 鍏ュ簱涓婃姤
inPath: mesin/v1
- outPath: mesin/v1
\ No newline at end of file
+ # 鍑哄簱涓婃姤
+ outPath: mesin/v1
+ # 鍚姩娴嬭瘯璇锋眰
+ startUpTestPACK: mesin/v1
+ #鏆傚仠娴嬭瘯
+ suspendTestPACK: mesin/v1
\ No newline at end of file
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 2244412..1ca68c2 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -34,6 +34,9 @@
<result column="mk" property="mk" />
<result column="barcode" property="barcode" />
<result column="ctn_no" property="ctnNo" />
+ <result column="fire_no" property="fireNo" />
+ <result column="fire_status" property="fireStatus" />
+ <result column="pack_status" property="packStatus" />
</resultMap>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index d63ca12..101a705 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -227,7 +227,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: 'PACK鐮�'}
,{field: 'specs', align: 'center',title: '閰嶇疆'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 54454f9..1f3d18e 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -23,6 +23,8 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
+ ,{field: 'fireStatus$', align: 'center',title: '娑堥槻鐘舵��', hide:false}
+ ,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', hide:false}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'pltType', align: 'center',title: ''}
// ,{field: 'ctnType', align: 'center',title: ''}
@@ -32,12 +34,12 @@
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
,{field: 'lev1', align: 'center',title: '灞�', sort:true}
- ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
- var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' disabled table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.fullPlt === 'Y'){html += " checked ";}
- html += ">";
- return html;
- },width:80}
+ // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+ // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' disabled table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.fullPlt === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // },width:80}
// ,{field: 'outEnable', align: 'center',title: ''}
// ,{field: 'ioTime$', align: 'center',title: ''}
// ,{field: 'firstTime$', align: 'center',title: ''}
@@ -54,7 +56,7 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
- ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
+ // ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
// ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
// ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
@@ -459,7 +461,9 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
-
+ fireNo: $('#fireNo').val(),
+ fireStatus: $('#fireStatus').val(),
+ packStatus: $('#packStatus').val(),
};
$.ajax({
url: baseUrl+"/locMast/"+name+"/auth",
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 76e6a1b..3a4f55d 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -28,18 +28,20 @@
{type: 'checkbox'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
+ ,{field: 'fireStatus$', align: 'center',title: '娑堥槻鐘舵��', width: 90, style: 'color: #8E2323'}
+ ,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', width: 90, style: 'color: #8E2323'}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
- ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
- var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.fullPlt === 'Y'){html += " checked ";}
- html += "disabled='disabled' >";
- return html;
- },width:80}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜鍙�'}
+ // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+ // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.fullPlt === 'Y'){html += " checked ";}
+ // html += "disabled='disabled' >";
+ // return html;
+ // },width:80}
+ ,{field: 'barcode', align: 'center',title: 'PACK鐮�'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 1e12d40..2d1bc76 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -71,6 +71,29 @@
</div>
</div>
</div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label"><span class="not-null">*</span>娑堥槻鎶ヨ鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select id="fireStatus" class="layui-input" type="text">
+<!-- <option style="display: none"></option>-->
+ <option value="0">姝ｅ父</option>
+ <option value="1">鎶ヨ</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label"><span class="not-null">*</span>娴嬭瘯鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select id="packStatus" class="layui-input" type="text">
+<!-- <option style="display: none"></option>-->
+ <option value="0">鏃�</option>
+ <option value="1">寰呮祴</option>
+ <option value="2">娴嬭瘯涓�</option>
+ <option value="3">闈欑疆涓�</option>
+ <option value="4">闈欑疆瀹屾垚</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
--
Gitblit v1.9.1