From 77140b11f195496f102b27190286a380c29e4dc9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 18 十月 2024 08:56:19 +0800
Subject: [PATCH] #
---
license.lic | 0
src/main/webapp/views/locMast/locMast.html | 3
src/main/java/com/zy/asrs/controller/OpenController.java | 3
src/main/webapp/static/js/mat/mat.js | 5
src/main/webapp/views/mat/mat.html | 2
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 90 +++++++++++-----------
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/java/com/zy/common/model/LocTypeDto.java | 6 -
src/main/java/com/zy/asrs/utils/Utils.java | 75 ++++++++++--------
src/main/webapp/static/js/order/order.js | 1
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 ++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4
src/main/java/com/zy/common/service/CommonService.java | 21 +++--
src/main/resources/license.lic | 0
src/main/resources/application.yml | 6
15 files changed, 124 insertions(+), 106 deletions(-)
diff --git a/license.lic b/license.lic
index c42fa89..cde7be6 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 304bb73..0fdc587 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -133,6 +133,7 @@
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鍏ュ簱鍗曟嵁涓嬪彂")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -218,7 +219,7 @@
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
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 3b0146a..8ac0a91 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -152,10 +152,17 @@
}
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
+
+ for (CombParam.CombMat elem : param.getCombMats()) {
+
+
+// param.getCombMats().forEach(elem -> {
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
+ if (Cools.isEmpty(orderDetl)) {
+ throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
+ }
if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
@@ -172,7 +179,8 @@
} else {
detlDtos.add(detlDto);
}
- });
+// });
+ }
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
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 57ad97c..5513387 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -558,8 +558,8 @@
public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
- locDetlEntityWrapper.ge("create_time",param.getStartTime());
- locDetlEntityWrapper.le("create_time",param.getEndTime());
+ locDetlEntityWrapper.ge("appe_time",param.getStartTime());
+ locDetlEntityWrapper.le("appe_time",param.getEndTime());
List<LocDetl> locDetls = locDetlService.selectList(locDetlEntityWrapper);
if (!Cools.isEmpty(locDetls)) {
for (LocDetl locDetl : locDetls) {
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 373ebf2..41d3f4d 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -62,51 +62,51 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ") //鍏ュ簱浠诲姟涓嬪彂
- private void ShuttleInTaskSend(){
- List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 101,110,103,104,107)
- .eq("wrk_sts", 105).eq("crn_no",7));
- if (!Cools.isEmpty(wrkMasts1)){
- return;
- }
- List<WrkMast> wrkMasts = wrkMastService.selectToShuttleTask();
- if (wrkMasts.isEmpty()) {
- return;
- }
- try {
- for (WrkMast wrkMast : wrkMasts) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
- if (locMast == null) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
- String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
- ShuttleTask param = new ShuttleTask();
- param.setTaskNo(wrkMast.getWrkNo().toString());
- param.setDestLoc(loc);
- param.setOriginSite("31002");
- param.setBarcode(wrkMast.getBarcode());
- param.setPriority("11");
- String response = new HttpHandler.Builder()
- .setUri(shuttleWcsUrl)
- .setPath("/openapi/createInTask")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- wrkMast.setWrkSts(105L);
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- }catch (Exception e){
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
-
- }
+// @Scheduled(cron = "0/3 * * * * ? ") //鍏ュ簱浠诲姟涓嬪彂
+// private void ShuttleInTaskSend(){
+// List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+// .in("io_type", 101,110,103,104,107)
+// .eq("wrk_sts", 105).eq("crn_no",7));
+// if (!Cools.isEmpty(wrkMasts1)){
+// return;
+// }
+// List<WrkMast> wrkMasts = wrkMastService.selectToShuttleTask();
+// if (wrkMasts.isEmpty()) {
+// return;
+// }
+// try {
+// for (WrkMast wrkMast : wrkMasts) {
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+// if (locMast == null) {
+// throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+// }
+// String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
+// ShuttleTask param = new ShuttleTask();
+// param.setTaskNo(wrkMast.getWrkNo().toString());
+// param.setDestLoc(loc);
+// param.setOriginSite("31002");
+// param.setBarcode(wrkMast.getBarcode());
+// param.setPriority("11");
+// String response = new HttpHandler.Builder()
+// .setUri(shuttleWcsUrl)
+// .setPath("/openapi/createInTask")
+// .setJson(JSON.toJSONString(param))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// Integer code = jsonObject.getInteger("code");
+// if (code.equals(200)) {
+// wrkMast.setWrkSts(105L);
+// if (!wrkMastService.updateById(wrkMast)) {
+// log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+// }
+// }
+// }
+// }catch (Exception e){
+// throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+// }
+//
+// }
@Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
private void ShuttleOutTaskSend(){
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 9ae5dff..2fb451b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -256,27 +256,34 @@
return false;
}
+ public static boolean BooleanWhsTypeSta2(Integer whsType) {
+ if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4 || whsType == 9) {
+ return true;
+ }
+ return false;
+ }
+
public static int RowCount(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber)[0];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[0];
}
public static int getCurRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber)[1];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[1];
}
public static int getCrnNo(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber)[2];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[2];
}
public static int getNearRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber)[3];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[3];
}
//搴撲綅鎺掑彿鍒嗛厤
- public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber,Integer whsType) {
switch (rowLastno.getTypeId()) {
case 1://缁忓吀鍙屼几搴撲綅
- return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
return LocNecessaryParametersDoubleExtension2(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 3://缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
@@ -295,39 +302,37 @@
}
//缁忓吀鍙屼几搴撲綅
- public static int[] LocNecessaryParametersDoubleExtension(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
-
- Integer sRow = rowLastno.getsRow();
- Integer sCrnNo = rowLastno.getsCrnNo();
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 4 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
- necessaryParameters[1] = sRow + 3; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow + 2; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- curRow = curRow + 4;
- if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
+ if (BooleanWhsTypeSta2(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 4)) {
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(crnNumber * 4 - 3)) {
+ necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ curRow = curRow + 4;
+ if (curRow < 1 || curRow > (crnNumber * 4)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - 1) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow + 3) / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = curRow / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
}
}
-
return necessaryParameters;
}
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index c6630aa..d12b054 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -29,11 +29,7 @@
if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
- if (basDevp.getLocType1() == 1) {
- this.locType1 = 1; // 浣庡簱浣�
- } else {
- this.locType1 = 2; // 楂樺簱浣�
- }
+ this.locType1 = basDevp.getLocType1();
log.info(JSON.toJSONString(this));
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e115601..619bcf2 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -209,7 +209,7 @@
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
for (int i = times; i < crnNumber*2; i++) {
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber,whsType);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
if (basCrnpService.checkSiteError(crnNo, true)) {
@@ -507,7 +507,7 @@
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
for (int i = times; i < crnNumber*2; i++) {
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber,whsType);
rowCount = locNecessaryParameters[0];
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
@@ -560,7 +560,7 @@
for (int i = 0; i < crnNumber*2; i++) {
if (!(Utils.getRow(locMastGro.getLocNo())>nearRowW && Utils.getRow(locMastGro.getLocNo())<=curRowW) && !(Utils.getRow(locMastGro.getLocNo())<nearRowW && Utils.getRow(locMastGro.getLocNo())>=curRowW) ){
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber,whsType);
curRowW = locNecessaryParameters[1];
nearRowW = locNecessaryParameters[3];
}else {
@@ -626,7 +626,7 @@
for (int i = 0; i < crnNumber*2; i++) {
if (!(Utils.getRow(locMastGro.getLocNo())>nearRowW && Utils.getRow(locMastGro.getLocNo())<=curRowW) && !(Utils.getRow(locMastGro.getLocNo())<nearRowW && Utils.getRow(locMastGro.getLocNo())>=curRowW) ){
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber,whsType);
curRowW = locNecessaryParameters[1];
nearRowW = locNecessaryParameters[3];
}else {
@@ -655,7 +655,7 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("crn_no",7));
int nearbay = 0;
int nearlev = 0;
for (LocMast locMastSign:locMasts){
@@ -678,7 +678,7 @@
for (int i = 0; i < crnNumber*2; i++) {
if (!(Utils.getRow(locMastGro.getLocNo())>nearRowW && Utils.getRow(locMastGro.getLocNo())<=curRowW) && !(Utils.getRow(locMastGro.getLocNo())<nearRowW && Utils.getRow(locMastGro.getLocNo())>=curRowW) ){
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber,whsType);
curRowW = locNecessaryParameters[1];
nearRowW = locNecessaryParameters[3];
}else {
@@ -696,7 +696,7 @@
bay2=Utils.getBay(locMast2.getLocNo())+1;
}
String targetLocNo = locMast2.getLocNo().substring(0,2) +zerofill(String.valueOf(bay2), 3) + locMast2.getLocNo().substring(5);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("crn_no",7).eq("loc_sts","O"));
if (Cools.isEmpty(locMast)){
continue;
}
@@ -742,7 +742,9 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", nearRow)
.eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
+ .eq("crn_no",7)
.orderBy("lev1",true).orderBy("row1",false));//鏈�娴呭簱浣�
+
for (LocMast locMast1 : locMasts) {
if (locMast != null){
break;
@@ -761,15 +763,18 @@
if (curRow < nearRow){
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
+ .eq("crn_no",7)
.orderBy("bay1",true));
if(locMasts1.size() == 3 || (curRow>20 && locMasts1.size() == 2)){
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
+ .eq("crn_no",7)
.orderBy("bay1",false));
}
}else {
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
+ .eq("crn_no",7)
.orderBy("bay1",false));
}
if (Cools.isEmpty(locMasts1)) {
@@ -879,7 +884,7 @@
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber,whsType);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
rowCount = locNecessaryParameters[0];
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a4cd9a1..67034af 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -39,7 +39,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: gdkyasrs
+ subject: jxgtwms
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -50,7 +50,7 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 宸︽繁搴撲綅鎺掑彿
@@ -105,4 +105,4 @@
url: ""
taskCreatePath: ""
shuttleWcs:
- url: "127.0.0.1:9090/wcs"
\ No newline at end of file
+ url: "10.200.50.222:9090/wcs"
\ No newline at end of file
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index c42fa89..cde7be6 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 406d0d3..dd7896b 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -70,7 +70,7 @@
select * from asr_wrk_mast
where wrk_sts=5
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,1,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 684cd34..ac98ca5 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -334,10 +334,11 @@
var templateDom = $("#templatePreview"+templateNo);
var className = templateDom.attr("class");
var param = "缂栫爜:"+res.data[i].matnr+";鍚嶇О:"+res.data[i].maktx+";瑙勬牸:"+res.data[i].specs;
+ var encodeUrl = encodeURIComponent(param);
if (className === 'template-barcode') {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+param;
+ res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+encodeUrl;
} else {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+param;
+ res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+encodeUrl;
}
}
var tpl = templateDom.html();
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ad09170..ee40725 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -47,6 +47,7 @@
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
+ {field: 'shipName', align: 'center',title: '鍒跺崟浜�'},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index e95ce3d..16c3475 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -217,7 +217,8 @@
<option style="display: none"></option>
<option value="0">鏈煡</option>
<option value="1">浣庡簱浣�</option>
- <option value="2">楂樺簱浣�</option>
+ <option value="2">涓簱浣�</option>
+ <option value="3">楂樺簱浣�</option>
</select>
</div>
</div>
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 6265f86..86ced73 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -355,7 +355,7 @@
<!-- 妯℃澘寮曟搸 -->
<script type="text/template" id="templatePreview1" class="template-qrcode">
{{#each data}}
- <div style="width: 150px;height: 300px;">
+ <div style="width: 150px;">
<div>
<img class="template-qrcode" src="{{this.barcodeUrl}}">
<div style="text-align: center;">{{this.matnr}}</div>
--
Gitblit v1.9.1