From 7c1af4c63e66754f0868c1a501f4895f9cbc9213 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 15 十一月 2024 09:29:12 +0800
Subject: [PATCH] 双单位
---
src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java | 7
src/main/java/com/zy/asrs/entity/OrderDetl.java | 4
src/main/java/com/zy/asrs/controller/OpenController.java | 2
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 5
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4
src/main/resources/application-prod.yml | 2
pom.xml | 5
src/main/webapp/views/orderLog/orderLog.html | 14
src/main/webapp/static/js/orderLog/order.js | 362 +------------------------
src/main/resources/application-loc.yml | 2
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 358 +++++++++++++------------
src/main/resources/application-dev.yml | 2
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 16 +
src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | 8
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6
src/main/resources/application.yml | 2
16 files changed, 260 insertions(+), 539 deletions(-)
diff --git a/pom.xml b/pom.xml
index d27ad5a..1032a20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,11 @@
<artifactId>truelicense-core</artifactId>
<version>1.33</version>
</dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-core</artifactId>
+ <version>5.8.26</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4f7716f..04cb1dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -316,6 +316,8 @@
//orderDetl.setbFree1(param.getBFree1());
orderDetl.setId(param.getId());
orderDetl.setIvouchrowno(param.getIvouchrowno());
+ orderDetl.setINum(param.getINum());
+ orderDetl.setIinvexchrate(param.getIinvexchrate());
//娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index b8fe4c0..460a30c 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -186,9 +186,9 @@
private Double length;
/**
- * 浣撶Н
+ * 鎹㈢畻鐜�
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value= "鎹㈢畻鐜�")
private Double volume;
/**
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
index 8c28331..b84f881 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
@@ -29,7 +29,11 @@
private Double nflat;
//鍗曟嵁鏃ユ湡
private String ddate;
+ //浠舵暟
+ private Double iNum;
+ //鎹㈢畻鐜�
+ private Double iinvexchrate;
//宸ュ崟鍙�
private String orderNo;
//宸ュ崟鍙稵
@@ -94,6 +98,9 @@
private String cbMemo;
//浠舵暟
private Double iNum;
+
+ //鎹㈢畻鐜�
+ private Double iinvexchrate;
//鍗曟嵁鏉ユ簮
private String cSource;
//鐢熶骇璁㈠崟鍙凤紙閿�鍞鍗曞彿锛�
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
index 8c99612..4783d06 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -35,6 +35,11 @@
private Integer states;
//鍗曟嵁鏃ユ湡
private String ddate;
+ //浠舵暟
+ private Double iNum;
+
+ //鎹㈢畻鐜�
+ private Double iinvexchrate;
private List<OrderDetl> children;
@@ -59,6 +64,9 @@
private String cbMemo;
//浠舵暟
private Double iNum;
+
+ //鎹㈢畻鐜�
+ private Double iinvexchrate;
//鍗曟嵁鏉ユ簮
private String cSource;
//鐢熶骇璁㈠崟鍙凤紙閿�鍞鍗曞彿锛�
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index d22feea..af0be84 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -284,8 +284,13 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+ OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), detlDto.getBatch(), detlDto.getCsocode());
AgvWaitPakin waitPakin = new AgvWaitPakin();
waitPakin.sync(mat);
+ if (orderDetl != null) {
+ waitPakin.setWeight(orderDetl.getWeight());
+ waitPakin.setVolume(orderDetl.getVolume());
+ }
waitPakin.setOrderNo(orderNo); // 鍗曟嵁缂栧彿
waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
//waitPakin.setZpallet(zpallet); // 璐ф灦鐮�
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 722ec96..376531f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -92,30 +92,30 @@
Date now = new Date();
agvBasDevpList.forEach(agvBasDevp -> {
- if(Cools.isEmpty(agvBasDevp.getBarcode())){
+ if (Cools.isEmpty(agvBasDevp.getBarcode())) {
throw new CoolException("閫変腑鐨勭珯鐐逛腑鍚湁鏈粦瀹氳揣鏋剁殑绔欑偣锛岃閲嶆柊閫夋嫨");
}
- if(!"F".equals(agvBasDevp.getLocSts())){
+ if (!"F".equals(agvBasDevp.getLocSts())) {
throw new CoolException("閫変腑鐨勭珯鐐逛腑鍚湁璐т綅鐘舵�佷笉涓篎.鍦ㄥ簱鐨勭珯鐐癸紝璇烽噸鏂伴�夋嫨");
}
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevp.getBarcode()));
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor(),false,false);
+ AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(), agvBasDevp.getFloor(), false, false);
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2(),agvLocMast.getPltType());
+ AgvWrkMast wrkMast = createWrkMast(1, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), agvBasDevp.getBarcode(), now, userId, agvBasDevp.getLocType2(), agvLocMast.getPltType());
//鏍囪鏄惁涓鸿緭閫佺嚎鍏ュ簱
wrkMast.setMk(isConveyor ? "Y" : "N");
//鐢熸垚宸ヤ綔妗ｆ槑缁�
agvWaitPakinList.forEach(wp -> {
- createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
+ createWrkDetlReWrite(wp.getMatnr(), wrkMast.getWrkNo(), wp.getOrderNo(), wp.getBatch(), wp.getAnfme(), wp.getSuppCode(), now, userId, wp.getThreeCode(), wp.getDeadTime(), wp.getProcessSts());
});
//鏇存柊婧愮珯鐐逛俊鎭�
- updateAgvBasDevp(agvBasDevp,"R");
+ updateAgvBasDevp(agvBasDevp, "R");
//鏇存柊鐩爣搴撲綅鐘舵��
- updateAgvLocMast(agvLocMast,"S");
+ updateAgvLocMast(agvLocMast, "S");
});
@@ -146,9 +146,9 @@
AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo);
//鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱
- int ioType = isPakOut(sourceLocNo,taskDto) ? 101 : 103;
+ int ioType = isPakOut(sourceLocNo, taskDto) ? 101 : 103;
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType());
+ AgvWrkMast wrkMast = createWrkMast(ioType, wrkSts, sourceLocNo, targetLocNo, containerCode, now, userId, Short.valueOf(containerCode.substring(0, 2)), agvLocMast.getPltType());
//鐢熸垚宸ヤ綔妗ｆ槑缁�
long flowId = snowflakeIdWorker.nextId();
taskDto.getLocDtos().forEach(locDto -> {
@@ -195,7 +195,7 @@
// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
// }
- }else {
+ } else {
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
orderDtoList.forEach(orderDto -> {
//鏄庣粏妗ｆ墍闇�鍙傛暟
@@ -221,10 +221,10 @@
// modifyOrderDetl(taskDto.getLocDtos().get(0), userId);
//鏇存柊婧愮珯鐐逛俊鎭�
String locSts = ioType == 101 ? "R" : "P";
- updateAgvLocMast(agvLocMastService.selectById(sourceLocNo),locSts);
+ updateAgvLocMast(agvLocMastService.selectById(sourceLocNo), locSts);
//鏇存柊鐩爣绔欑偣鐘舵��
//locSts = ioType == 101 ? "S" : "Q";
- updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo),"S");
+ updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo), "S");
});
}
@@ -254,7 +254,7 @@
//鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱
int ioType = 107;
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType());
+ AgvWrkMast wrkMast = createWrkMast(ioType, wrkSts, sourceLocNo, targetLocNo, containerCode, now, userId, Short.valueOf(containerCode.substring(0, 2)), agvLocMast.getPltType());
//鐢熸垚宸ヤ綔妗ｆ槑缁�
long flowId = snowflakeIdWorker.nextId();
taskDto.getLocDtos().forEach(locDto -> {
@@ -300,7 +300,7 @@
// if (!flowLogService.insert(flowLog)) {
// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
// }
- }else {
+ } else {
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
orderDtoList.forEach(orderDto -> {
//鏄庣粏妗ｆ墍闇�鍙傛暟
@@ -325,17 +325,17 @@
// modifyOrderDetl(taskDto.getLocDtos().get(0), userId);
//鏇存柊婧愮珯鐐逛俊鎭�
String locSts = "R";
- updateAgvLocMast(agvLocMastService.selectById(sourceLocNo),locSts);
+ updateAgvLocMast(agvLocMastService.selectById(sourceLocNo), locSts);
//鏇存柊鐩爣绔欑偣鐘舵��
//locSts = ioType == 101 ? "S" : "Q";
- updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo),"S",Short.valueOf(containerCode.substring(0,2)),containerCode);
+ updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo), "S", Short.valueOf(containerCode.substring(0, 2)), containerCode);
});
}
//鎷ｆ枡鍏ュ簱
@Transactional
- public void pickIn(List<AgvWrkMast> agvWrkMastList){
+ public void pickIn(List<AgvWrkMast> agvWrkMastList) {
Date now = new Date();
agvWrkMastList.forEach(agvWrkMast -> {
@@ -361,11 +361,11 @@
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {
agvWrkDetl.setIoTime(now);
- boolean bl = agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>()
+ boolean bl = agvWrkDetlService.update(agvWrkDetl, new EntityWrapper<AgvWrkDetl>()
.eq("wrk_no", agvWrkDetl.getWrkNo())
- .eq("matnr",agvWrkDetl.getMatnr())
- .eq("order_no",agvWrkDetl.getOrderNo())
- .eq("three_code",agvWrkDetl.getThreeCode()));
+ .eq("matnr", agvWrkDetl.getMatnr())
+ .eq("order_no", agvWrkDetl.getOrderNo())
+ .eq("three_code", agvWrkDetl.getThreeCode()));
// .eq("dead_time",agvWrkDetl.getDeadTime()));
}
AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
@@ -387,9 +387,9 @@
// });
//}
//淇敼搴撲綅淇℃伅
- updateAgvLocMast(agvLocMast,"Q");
+ updateAgvLocMast(agvLocMast, "Q");
//淇敼绔欑偣淇℃伅
- updateAgvBasDevp(agvBasDevp,"R");
+ updateAgvBasDevp(agvBasDevp, "R");
});
}
@@ -403,11 +403,11 @@
List<TaskDto> taskDtos = new ArrayList<>();
param.getLocDetls().forEach(locDetl -> {
- LocDto locDto = new LocDto(locDetl.getLocNo(),locDetl.getCount(),locDetl.getMatnr(),locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),locDetl.getSuppCode(), locDetl.getProcessSts());
- TaskDto taskDto = new TaskDto(locDetl.getLocNo(),station,locDto);
- if(TaskDto.has(taskDtos,taskDto)){
- TaskDto.find(taskDtos,taskDto).getLocDtos().add(locDto);
- }else {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getCount(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), locDetl.getSuppCode(), locDetl.getProcessSts());
+ TaskDto taskDto = new TaskDto(locDetl.getLocNo(), station, locDto);
+ if (TaskDto.has(taskDtos, taskDto)) {
+ TaskDto.find(taskDtos, taskDto).getLocDtos().add(locDto);
+ } else {
taskDtos.add(taskDto);
}
});
@@ -417,14 +417,14 @@
//鍒ゆ柇鏄惁鏈夐噸澶嶆枡鎯崇殑宸ヤ綔褰�
AgvWrkMast agvWrkMastList = agvWrkMastService.selectByContainerCode(taskDto.getLocDtos().get(0).getContainerCode());
- if(!Cools.isEmpty(agvWrkMastList)){
+ if (!Cools.isEmpty(agvWrkMastList)) {
return;
}
int containerType = getContainerTypeByloc(taskDto.getLocNo());
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType,null);
+ AgvWrkMast wrkMast = createWrkMast(107, 21L, taskDto.getLocNo(), taskDto.getAgvStaNo(), taskDto.getLocDtos().get(0).getContainerCode(), now, userId, containerType, null);
//鐢熸垚宸ヤ綔妗ｆ槑缁�
taskDto.getLocDtos().forEach(locDto -> {
//鏄庣粏妗ｆ墍闇�鍙傛暟
@@ -440,10 +440,10 @@
locDto.getIsoseq(),
locDto.getProcessSts());
});
- updateAgvLocMast(agvLocMastService.selectById(wrkMast.getSourceLocNo()),"P");
+ updateAgvLocMast(agvLocMastService.selectById(wrkMast.getSourceLocNo()), "P");
//鏇存柊鐩爣绔欑偣鐘舵��
//locSts = ioType == 101 ? "S" : "Q";
- updateAgvBasDevp(agvBasDevpService.selectById(wrkMast.getLocNo()),"S");
+ updateAgvBasDevp(agvBasDevpService.selectById(wrkMast.getLocNo()), "S");
});
}
@@ -457,30 +457,30 @@
AgvLocMast targetLocMast = agvLocMastService.selectById(targetLocNo);
AgvLocDetl sourceLocDetl = agvLocDetlService.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", sourceLocMast.getLocNo()));
- if(!sourceLocMast.getLocSts().equals("F")){
- throw new CoolException(sourceLocMast.getLocNo() + "婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLocMast.getLocSts$());
+ if (!sourceLocMast.getLocSts().equals("F")) {
+ throw new CoolException(sourceLocMast.getLocNo() + "婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細" + sourceLocMast.getLocSts$());
}
- if(!targetLocMast.getLocSts().equals("O")){
- throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+targetLocMast.getLocSts$());
+ if (!targetLocMast.getLocSts().equals("O")) {
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + targetLocMast.getLocSts$());
}
Date now = new Date();
//鐢熸垚绉诲簱宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo),targetLocMast.getPltType());
+ AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId, getContainerTypeByloc(sourceLocNo), targetLocMast.getPltType());
//鐢熸垚宸ヤ綔鍏氭槑缁�
- createWrkDetlReWrite(sourceLocDetl.getMatnr(),wrkMast.getWrkNo(),null,sourceLocDetl.getBatch(),sourceLocDetl.getAnfme(),sourceLocDetl.getZpallet(),now,userId,sourceLocDetl.getThreeCode(),sourceLocDetl.getDeadTime(),sourceLocDetl.getProcessSts());
+ createWrkDetlReWrite(sourceLocDetl.getMatnr(), wrkMast.getWrkNo(), null, sourceLocDetl.getBatch(), sourceLocDetl.getAnfme(), sourceLocDetl.getZpallet(), now, userId, sourceLocDetl.getThreeCode(), sourceLocDetl.getDeadTime(), sourceLocDetl.getProcessSts());
//淇敼鐩爣搴撲綅鐘舵��
- updateAgvLocMast(targetLocMast,"S");
+ updateAgvLocMast(targetLocMast, "S");
//淇敼鍘熷簱浣嶇姸鎬�
- updateAgvLocMast(sourceLocMast,"R");
+ updateAgvLocMast(sourceLocMast, "R");
}
/*
鍏ュ簱
*/
@Transactional
- public String emptyPlateIn(String station,String containerCode,Short containerType, Long userId, boolean emptyAutoIn) {
+ public String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn) {
Date now = new Date();
@@ -488,7 +488,7 @@
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
if (Cools.isEmpty(agvBasDevp)) {
- throw new CoolException("鏆傛棤"+ station + "绔欑偣");
+ throw new CoolException("鏆傛棤" + station + "绔欑偣");
}
int br = 0;
if (containerType == 21 && agvBasDevp.getFloor() == 2) {
@@ -529,13 +529,13 @@
locType = agvBasDevp.getLocType1();
}
- if(!Cools.eq(agvBasDevp.getBarcode(),containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn){
- throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts()+",鏃犳硶杩涜鍏ュ簱");
+ if (!Cools.eq(agvBasDevp.getBarcode(), containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn) {
+ throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts() + ",鏃犳硶杩涜鍏ュ簱");
}
//鏌ヨ宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
- if(!Cools.isEmpty(agvWrkMast) && !emptyAutoIn){
+ if (!Cools.isEmpty(agvWrkMast) && !emptyAutoIn) {
throw new CoolException("褰撳墠璐ф灦宸叉湁鍏ュ簱浠诲姟锛屾棤娉曡繘琛屽叆搴�");
}
@@ -550,7 +550,7 @@
//鏌ヨ鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
- if(!Cools.isEmpty(agvWaitPakinList)){
+ if (!Cools.isEmpty(agvWaitPakinList)) {
AtomicBoolean isCurrLev = new AtomicBoolean(false);
agvWaitPakinList.forEach(agvWaitPakin -> {
if (!Cools.isEmpty(agvWaitPakin.getProcessSts())) {
@@ -564,19 +564,19 @@
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks"));
if (Cools.isEmpty(config)) {
if (isCurrLev.get()) {
- agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
} else {
- agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
}
} else {
List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
- agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
} else {
if (isCurrLev.get()) {
- agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
} else {
- agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
}
//agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
}
@@ -586,31 +586,31 @@
String locNo = agvLocMast.getLocNo();
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType,agvLocMast.getPltType());
+ AgvWrkMast wrkMast = createWrkMast(1, 201L, devNo, locNo, containerCode, now, userId, containerType, agvLocMast.getPltType());
//鐢熸垚宸ヤ綔妗ｆ槑缁�
long flowId = snowflakeIdWorker.nextId();
agvWaitPakinList.forEach(wp -> {
- createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
+ createWrkDetlReWrite(wp.getMatnr(), wrkMast.getWrkNo(), wp.getOrderNo(), wp.getBatch(), wp.getAnfme(), wp.getSuppCode(), now, userId, wp.getThreeCode(), wp.getDeadTime(), wp.getProcessSts());
});
//淇敼鍏ュ簱閫氱煡妗ｇ姸鎬�
- agvWaitPakinService.updateIoStatus(containerCode,"Y");
+ agvWaitPakinService.updateIoStatus(containerCode, "Y");
//鏇存柊婧愮珯鐐圭姸鎬�
- updateAgvBasDevp(agvBasDevp,"R",containerType);
- }else {
+ updateAgvBasDevp(agvBasDevp, "R", containerType);
+ } else {
//鏌ヨ宸ヤ綔妗�
AgvWrkMast agvWrkMast1 = agvWrkMastService.selectByContainerCode(containerCode);
if (!Cools.isEmpty(agvWrkMast1)) {
throw new CoolException("褰撳墠璐ф灦宸叉湁鍏ュ簱浠诲姟锛屾棤娉曡繘琛屽叆搴�");
}
- agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), true, true);
// 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
- createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType,agvLocMast.getPltType());
+ createWrkMast(10, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), containerCode, now, userId, containerType, agvLocMast.getPltType());
//鏇存柊婧愮珯鐐圭姸鎬�
- updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);
+ updateAgvBasDevp(agvBasDevp, "R", containerType, containerCode);
}
//鏇存柊鐩爣搴撲綅鐘舵�佸拰淇℃伅
- updateAgvLocMast(agvLocMast,"S");
+ updateAgvLocMast(agvLocMast, "S");
return agvLocMast.getLocNo();
}
@@ -623,17 +623,17 @@
// 绔欑偣妫�娴�
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
- if(!agvBasDevp.getLocSts().equals("O")){
- throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts()+",鏃犳硶杩涜绌烘澘鍑哄簱");
+ if (!agvBasDevp.getLocSts().equals("O")) {
+ throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts() + ",鏃犳硶杩涜绌烘澘鍑哄簱");
}
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvBasDevp.getDevNo()));
- if(!Cools.isEmpty(agvWrkMast)){
- throw new CoolException("鏈夎揣鏋跺湪寰�绔欑偣鎼繍" + agvBasDevp.getDevNo()+",鏃犳硶杩涜绌烘澘鍑哄簱");
+ if (!Cools.isEmpty(agvWrkMast)) {
+ throw new CoolException("鏈夎揣鏋跺湪寰�绔欑偣鎼繍" + agvBasDevp.getDevNo() + ",鏃犳硶杩涜绌烘澘鍑哄簱");
}
//瀵绘壘鐩稿簲绫诲瀷鐨勭┖璐ф灦
- AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType,agvBasDevp.getFloor());
- if(containerType == 0){
+ AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, agvBasDevp.getFloor());
+ if (containerType == 0) {
//绌烘澘鑷姩鍑哄簱锛屾牴鎹珯鐐圭被鍨嬮�夋嫨
agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());
@@ -643,13 +643,13 @@
throw new CoolException("鏆傛棤褰撳墠鍑哄簱绔欑偣绫诲瀷鐨勭┖璐ф灦锛�");
}
//鐢熸垚宸ヤ綔妗�
- createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType,agvLocMast.getPltType());
+ createWrkMast(110, 21L, agvLocMast.getLocNo(), agvBasDevp.getDevNo(), agvLocMast.getBarcode(), now, userId, containerType, agvLocMast.getPltType());
//淇敼婧愬簱浣嶇姸鎬�
- updateAgvLocMast(agvLocMast,"R");
+ updateAgvLocMast(agvLocMast, "R");
//淇敼绔欑偣鐘舵��
- updateAgvBasDevp(agvBasDevp,"S",(short)containerType,agvLocMast.getBarcode());
+ updateAgvBasDevp(agvBasDevp, "S", (short) containerType, agvLocMast.getBarcode());
}
@@ -677,12 +677,14 @@
Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();
while (iterator1.hasNext()) {
LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();
- if (adjust.getCount() == 0) { continue; }
- if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch()) && Cools.eq(locDetl.getSuppCode(),adjust.getSuppCode()) && Cools.eq(locDetl.getThreeCode(),adjust.getThreeCode()) && Cools.eq(locDetl.getDeadTime(),adjust.getDeadTime())) {
+ if (adjust.getCount() == 0) {
+ continue;
+ }
+ if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch()) && Cools.eq(locDetl.getSuppCode(), adjust.getSuppCode()) && Cools.eq(locDetl.getThreeCode(), adjust.getThreeCode()) && Cools.eq(locDetl.getDeadTime(), adjust.getDeadTime())) {
if (!locDetl.getAnfme().equals(adjust.getCount()) || !locDetl.getProcessSts().equals(adjust.getProcessSts())) {
// todo 鐩樼偣璁板綍
// 淇敼搴撳瓨
- if (!agvLocDetlService.updateAnfmeProcess(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),adjust.getProcessSts())) {
+ if (!agvLocDetlService.updateAnfmeProcess(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), adjust.getProcessSts())) {
throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�");
}
// 淇濆瓨璋冩暣璁板綍
@@ -714,7 +716,7 @@
// 鍒犻櫎搴撳瓨
for (AgvLocDetl locDetl : locDetls) {
// todo 鐩樼偣璁板綍
- if (!agvLocDetlService.updateAnfmeProcess(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getThreeCode(),locDetl.getDeadTime(),locDetl.getProcessSts())) {
+ if (!agvLocDetlService.updateAnfmeProcess(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getThreeCode(), locDetl.getDeadTime(), locDetl.getProcessSts())) {
throw new CoolException("鍒犻櫎" + locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佸簱瀛樻槑缁嗗け璐�");
}
// 淇濆瓨璋冩暣璁板綍
@@ -736,7 +738,9 @@
// 娣诲姞搴撳瓨
for (LocDetlAdjustParam.LocDetlAdjust adjust : list) {
- if (adjust.getCount() == 0.0D) { continue; }
+ if (adjust.getCount() == 0.0D) {
+ continue;
+ }
Mat mat = matService.selectByMatnr(adjust.getMatnr());
AgvLocDetl locDetl = new AgvLocDetl();
locDetl.sync(mat);
@@ -796,17 +800,17 @@
@Transactional
public void completeWrkMast(String workNo, Long userId) {
AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo);
- if (Cools.isEmpty(wrkMast)){
- throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
if (wrkMast.getIoType() == 113 && (wrkMast.getWrkSts() != 212L || wrkMast.getWrkSts() != 213L || wrkMast.getWrkSts() != 214L)) {
- throw new CoolException(workNo+"涓嶆敮鎸佹墜鍔ㄧ淮鎶�");
+ throw new CoolException(workNo + "涓嶆敮鎸佹墜鍔ㄧ淮鎶�");
}
- if (wrkMast.getIoType()==121){
- if (wrkMast.getWrkSts()<12L){
- agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"鎵嬪姩瀹屾垚",userId);
- }else if (wrkMast.getWrkSts()==12L){
- agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),12,"鎵嬪姩瀹屾垚",userId);
+ if (wrkMast.getIoType() == 121) {
+ if (wrkMast.getWrkSts() < 12L) {
+ agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 205, "鎵嬪姩瀹屾垚", userId);
+ } else if (wrkMast.getWrkSts() == 12L) {
+ agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 12, "鎵嬪姩瀹屾垚", userId);
WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", workNo));
wrkMastExecute.setWrkSts(3L);
@@ -815,47 +819,47 @@
}
return;
- } else {
- if(wrkMast.getIoType() == 110){
- agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),206,"鎵嬪姩瀹屾垚",userId);
+ } else {
+ if (wrkMast.getIoType() == 110) {
+ agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 206, "鎵嬪姩瀹屾垚", userId);
} else {
- agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"鎵嬪姩瀹屾垚",userId);
+ agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(), 205, "鎵嬪姩瀹屾垚", userId);
}
}
//鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷ｆ枡鍑哄簱 || 107.鐩樼偣鍑哄簱
- if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 111){
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 111) {
//淇敼鍑哄簱绔欑偣鐘舵��
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(), "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
}
- if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 ){
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53) {
//淇敼鍑哄簱绔欑偣鐘舵��
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O","",wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(), "O", "", wrkMast.getWhsType().shortValue());
}
//鍑哄簱浠诲姟 110.绌烘澘鍑哄簱
if (wrkMast.getIoType() == 10) {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(), "O", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
}
}
@Transactional
- public void cancelWrkMast(String workNo, Long userId,Integer type) {
+ public void cancelWrkMast(String workNo, Long userId, Integer type) {
AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo);
long flowId = snowflakeIdWorker.nextId();
- if (Cools.isEmpty(wrkMast)){
- throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getIoType()==121){
- if (wrkMast.getWrkSts()<12L){
+ if (wrkMast.getIoType() == 121) {
+ if (wrkMast.getWrkSts() < 12L) {
//婧愬簱浣�
String locNo = wrkMast.getSourceLocNo();
// 鐩爣搴撲綅
String targetLocNo = wrkMast.getLocNo();
- agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
- agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
+ agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(new Date());
@@ -872,7 +876,7 @@
//鍒犻櫎宸ヤ綔妗ｄ互鍙婃槑缁�
- if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
+ if (!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())) {
throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -880,26 +884,26 @@
//璋冪敤agv鍙栨秷浠诲姟鎺ュ彛
agvWrkMastService.callCancelTask(wrkMast.getWrkNo());
}
- }else {
+ } else {
throw new CoolException("褰撳墠浠诲姟姝ｅ湪鎵ц锛屼笉鍙彇娑�");
}
- }else {
+ } else {
//鎷ｆ枡鍏ュ簱 鐩樼偣鍏ュ簱涓嶅彲鍙栨秷
- if(wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){
+ if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
throw new CoolException("褰撳墠浠诲姟涓嶅彲鍙栨秷");
}
//鍏ュ簱鍙栨秷
- if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 58){
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 58) {
//婧愮珯鐐�
String devNo = wrkMast.getSourceLocNo();
//鐩爣搴撲綅
String locNo = wrkMast.getLocNo();
- agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
+ agvLocMastService.updateLocStsByLocNo(locNo, "O", "", null);
if (wrkMast.getIoType() == 58) {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
} else {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", wrkMast.getWhsType().shortValue());
}
if (wrkMast.getIoType() == 1) {
@@ -941,7 +945,7 @@
// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
// }
// 鍒犻櫎缁勬墭妗�
- if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSuppCode()).eq("matnr",agvWaitPakin.getMatnr()).eq("three_code",agvWaitPakin.getThreeCode()))) {
+ if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvWaitPakin.getSuppCode()).eq("matnr", agvWaitPakin.getMatnr()).eq("three_code", agvWaitPakin.getThreeCode()))) {
throw new CoolException("鍏ュ簱閫氱煡妗ｅ彇娑堝け璐�");
}
}
@@ -951,14 +955,14 @@
// 绉诲簱鍙栨秷
- } else if( wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
+ } else if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
//婧愬簱浣�
String locNo = wrkMast.getSourceLocNo();
// 鐩爣搴撲綅
String targetLocNo = wrkMast.getLocNo();
- agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
- agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
+ agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
// 婧愬簱浣� 搴撲綅涓绘。
AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
@@ -1004,7 +1008,7 @@
}
// 鑷姩璋冩嫧鍑哄簱鍙栨秷
- } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111 || wrkMast.getIoType() == 112) {
+ } else if (wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111 || wrkMast.getIoType() == 112) {
if (wrkMast.getIoType() == 112) {
throw new CoolException("褰撳墠浣滀笟涓嶈兘鍙栨秷锛�");
}
@@ -1072,8 +1076,8 @@
String locNo = wrkMast.getSourceLocNo();
// 鐩爣搴撲綅
String targetLocNo = wrkMast.getLocNo();
- agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
- agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
+ agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
// 婧愬簱浣� 搴撲綅涓绘。
AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
@@ -1093,61 +1097,61 @@
//鐩爣绔欑偣
String devNo = wrkMast.getLocNo();
if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 109) {
- if (wrkMast.getIoType() == 109){
+ if (wrkMast.getIoType() == 109) {
// 婧愬簱浣嶆槸绔欑偣
- if ("DB".equals(locNo.substring(0,2))) {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
- agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
+ if ("DB".equals(locNo.substring(0, 2))) {
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
+ agvLocMastService.updateLocStsByLocNo(devNo, "O", "", null);
// 婧愬簱浣嶆槸搴撲綅 鐩爣搴撲綅鏄珯鐐�
- } else if ("DB".equals(devNo.substring(0,2))) {
- agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"O","",null);
+ } else if ("DB".equals(devNo.substring(0, 2))) {
+ agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "O", "", null);
// 婧愬簱浣嶆槸搴撲綅
} else {
- agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
- agvLocMastService.updateLocStsByLocNo(devNo,"O","",null);
+ agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
+ agvLocMastService.updateLocStsByLocNo(devNo, "O", "", null);
}
- }else {
- agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
+ } else {
+ agvLocMastService.updateLocStsByLocNo(locNo, "D", wrkMast.getBarcode(), wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", null);
}
} else if (wrkMast.getIoType() == 113) {
if (wrkMast.getWrkSts() == 212 || wrkMast.getWrkSts() == 213) {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
} else {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
if (!Cools.isEmpty(devNo)) {
- agvLocMastService.updateLocStsByLocNo(devNo,"0","",null);
+ agvLocMastService.updateLocStsByLocNo(devNo, "0", "", null);
}
}
- } else {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
- agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
+ } else {
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo, "O", "", null);
+ agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo));
}
}
- if(wrkMast.getIoType() != 114 && wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
+ if (wrkMast.getIoType() != 114 && wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType() != 111 && wrkMast.getIoType() != 108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11) {
//璁㈠崟鍥炴粴
//List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
agvWrkDetlList1.forEach(agvWrkDetl -> {
- if(!Cools.isEmpty(agvWrkDetl.getOrderNo())){
+ if (!Cools.isEmpty(agvWrkDetl.getOrderNo())) {
String orderNo = agvWrkDetl.getOrderNo();
- if(orderNo.contains("{")){
+ if (orderNo.contains("{")) {
JSONArray orderArray = JSON.parseArray(orderNo);
- for (Object o : orderArray){
+ for (Object o : orderArray) {
JSONObject jsonobject = (JSONObject) o;
- OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
+ OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
orderDetlService.updateById(orderDetl);
}
- }else {
- OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
+ } else {
+ OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
orderDetlService.updateById(orderDetl);
}
@@ -1169,7 +1173,7 @@
//鍒犻櫎宸ヤ綔妗ｄ互鍙婃槑缁�
- if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
+ if (!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())) {
throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -1183,7 +1187,7 @@
/*
鏇存柊鐩爣搴撲綅淇℃伅
*/
- private void updateAgvLocMast(AgvLocMast locMast, String locSts){
+ private void updateAgvLocMast(AgvLocMast locMast, String locSts) {
locMast.setLocSts(locSts);
locMast.setModiTime(new Date());
agvLocMastService.updateById(locMast);
@@ -1192,7 +1196,7 @@
/*
鏇存柊鐩爣搴撲綅淇℃伅鍜屽簱浣嶈揣鏋剁被鍨�
*/
- private void updateAgvLocMast(AgvLocMast locMast, String locSts, short type){
+ private void updateAgvLocMast(AgvLocMast locMast, String locSts, short type) {
locMast.setLocSts(locSts);
locMast.setLocType2(type);
locMast.setModiTime(new Date());
@@ -1202,8 +1206,8 @@
/*
鏇存柊婧愮珯鐐逛俊鎭�
*/
- private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts){
- if(!Cools.isEmpty(agvBasDevp)){
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts) {
+ if (!Cools.isEmpty(agvBasDevp)) {
agvBasDevp.setLocSts(locSts);
agvBasDevpService.updateById(agvBasDevp);
}
@@ -1212,16 +1216,16 @@
/*
鏇存柊婧愮珯鐐逛俊鎭拰搴撲綅璐ф灦绫诲瀷
*/
- private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType){
- if(!Cools.isEmpty(agvBasDevp)){
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType) {
+ if (!Cools.isEmpty(agvBasDevp)) {
agvBasDevp.setLocSts(locSts);
agvBasDevp.setLocType2(continerType);
agvBasDevpService.updateById(agvBasDevp);
}
}
- private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
- if(!Cools.isEmpty(agvBasDevp)){
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode) {
+ if (!Cools.isEmpty(agvBasDevp)) {
agvBasDevp.setLocSts(locSts);
agvBasDevp.setLocType2(continerType);
agvBasDevp.setBarcode(containerCode);
@@ -1232,13 +1236,18 @@
/*
鐢熸垚宸ヤ綔妗ｆ槑缁�
*/
- private void createWrkDetlReWrite(String matnr, int wrkNo, String orderNo,String batch, double anfme, String zpallet, Date now, Long userId, String csocode, String isoseq,Integer processSts){
+ private void createWrkDetlReWrite(String matnr, int wrkNo, String orderNo, String batch, double anfme, String zpallet, Date now, Long userId, String csocode, String isoseq, Integer processSts) {
Mat mat = matService.selectByMatnr(matnr);
if (Cools.isEmpty(mat)) {
throw new CoolException(matnr + "鍟嗗搧缁存姢澶辫触");
}
+ OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), batch, csocode);
AgvWrkDetl wrkDetl = new AgvWrkDetl();
wrkDetl.sync(mat);
+ if (orderDetl != null) {
+ wrkDetl.setWeight(orderDetl.getWeight());
+ wrkDetl.setVolume(orderDetl.getVolume());
+ }
wrkDetl.setWrkNo(wrkNo);
wrkDetl.setOrderNo(orderNo);
wrkDetl.setIoTime(now);
@@ -1262,7 +1271,7 @@
鐢熸垚宸ヤ綔妗ｆ槑缁�
*/
@Deprecated
- private void createWrkDetlReWrite(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId){
+ private void createWrkDetlReWrite(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId) {
Date now = new Date();
agvWaitPakinList.stream().forEach(agvWaitPakin -> {
Mat mat = matService.selectByMatnr(agvWaitPakin.getMatnr());
@@ -1271,6 +1280,9 @@
}
AgvWrkDetl wrkDetl = new AgvWrkDetl();
wrkDetl.sync(mat);
+ wrkDetl.setWeight(agvWaitPakin.getWeight());
+ wrkDetl.setVolume(agvWaitPakin.getVolume());
+
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setOrderNo(agvWaitPakin.getOrderNo());
wrkDetl.setIoTime(now);
@@ -1290,7 +1302,7 @@
/*
鐢熸垚宸ヤ綔妗�
*/
- private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType,Integer pltType){
+ private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, Integer pltType) {
AgvWrkMast wrkMast = new AgvWrkMast();
//宸ヤ綔鐘舵��
wrkMast.setWrkSts(wrkSts);
@@ -1322,19 +1334,19 @@
//鏆傚瓨浣嶄换鍔�+1
addInQty(locNo);
- wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
+ wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));
return wrkMast;
}
- private boolean isPakOut(String locNo, TaskDto taskDto){
+ private boolean isPakOut(String locNo, TaskDto taskDto) {
Double allAnfme = agvLocDetlService.selectSumAnfmeByLocNo(locNo);
Double pakOutAnfme = 0.0;
- for (LocDto locDto : taskDto.getLocDtos()){
+ for (LocDto locDto : taskDto.getLocDtos()) {
pakOutAnfme += locDto.getAnfme();
}
- if(allAnfme > pakOutAnfme){
+ if (allAnfme > pakOutAnfme) {
return false;
}
return true;
@@ -1344,19 +1356,19 @@
AGV鐢熸垚鍑哄簱宸ヤ綔妗ｅ悗淇敼璁㈠崟淇℃伅
TODO 涓庡洓椤瑰簱鐢熸垚鍑哄簱宸ヤ綔妗ｅ悗淇敼璁㈠崟淇℃伅鏁村悎鍒颁竴璧�
*/
- private void modifyOrderDetl(LocDto locDto, Long userId){
+ private void modifyOrderDetl(LocDto locDto, Long userId) {
if (!BaseController.isJSON(locDto.getOrderNo())) {
//闈炲悎骞跺嚭搴�
- OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
+ OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
+ orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getCsocode(), locDto.getIsoseq());
}
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(),locDto.getCsocode(),locDto.getIsoseq())) {
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), locDto.getCsocode(), locDto.getIsoseq())) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
- }else {
+ } else {
//鍚堝苟鍑哄簱
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
@@ -1366,20 +1378,20 @@
Double orderAnfme;
for (OrderDto orderDto : orderDtoList) {
- OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
+ OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
+ orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null, locDto.getCsocode(), locDto.getIsoseq());
}
orderAnfme = orderDetl.getAnfme() - orderDetl.getQty();
- if(locAnfme > orderAnfme){
+ if (locAnfme > orderAnfme) {
locAnfme -= orderAnfme;
- }else {
+ } else {
orderAnfme = locAnfme;
}
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderAnfme,orderDetl.getThreeCode(),orderDetl.getDeadTime())) {
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderAnfme, orderDetl.getThreeCode(), orderDetl.getDeadTime())) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
@@ -1400,30 +1412,30 @@
if (wrkMast.getIoType() == 108) {
wrkMast.setIoType(111);
wrkMast.setModiTime(new Date());
- agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
- } else if(wrkMast.getIoType() == 111) {
+ agvWrkMastService.update(wrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
+ } else if (wrkMast.getIoType() == 111) {
wrkMast.setIoType(108);
wrkMast.setModiTime(new Date());
- agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
+ agvWrkMastService.update(wrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
}
}
- private void addInQty(String devno){
+ private void addInQty(String devno) {
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devno);
- if(!Cools.isEmpty(agvBasDevp)){
- if(Cools.isEmpty(agvBasDevp.getInQty())){
+ if (!Cools.isEmpty(agvBasDevp)) {
+ if (Cools.isEmpty(agvBasDevp.getInQty())) {
agvBasDevp.setInQty(1);
- }else {
+ } else {
agvBasDevp.setInQty(agvBasDevp.getInQty() + 1);
}
}
}
- private int getContainerTypeByloc(String locNo){
+ private int getContainerTypeByloc(String locNo) {
- return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no",locNo)).getLocType2();
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo)).getLocType2();
}
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 f0a2001..d693b49 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1021,7 +1021,11 @@
//閿�鍞鍗曞彿
od.setThreeCode(odParam.getCDefine22());
//鑷敱椤�
- od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+ if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
+ od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+ }
+ od.setWeight(odParam.getINum());
+ od.setVolume(odParam.getIinvexchrate());
//IDs
od.setSku(odParam.getId());
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 78f6ef6..55b88d9 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -81,9 +81,9 @@
}
//@Scheduled(cron = "* 0/5 * * * ? ")
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
- public void reportOrder() {
+ public synchronized void reportOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
orderList.forEach(order -> {
orderSyncHandler.timelyStart(order);
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 753c6fb..1e47661 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,5 +1,7 @@
package com.zy.asrs.task.handler;
+import cn.hutool.core.util.NumberUtil;
+import com.alibaba.excel.util.NumberUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
@@ -22,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -150,8 +153,11 @@
if (s.length > 1) {
childInfo.setCBatch(s[0]);
childInfo.setBFree1(s[1]);
- } else {
+ } else if (s.length == 1) {
childInfo.setCBatch(s[0]);
+ childInfo.setBFree1("");
+ } else {
+ childInfo.setCBatch("");
childInfo.setBFree1("");
}
}
@@ -161,7 +167,13 @@
childInfo.setCOrderCode(orderDetl.getOrderNo());
childInfo.setIvouchrowno(orderDetl.getItemNum());
childInfo.setDefine22(orderDetl.getThreeCode());
-
+ if (!Cools.isEmpty(orderDetl.getWeight()) && !Cools.isEmpty(orderDetl.getVolume())) {
+ BigDecimal mul = NumberUtil.div(childInfo.getIQuantity(), orderDetl.getVolume() + "");
+ childInfo.setINum(mul.toString());
+ } else {
+ childInfo.setINum("1");
+ }
+ childInfo.setIinvexchrate(Cools.isEmpty(orderDetl.getVolume()) ? "" : orderDetl.getVolume() + "");
paramChild.add(childInfo);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 9804b7a..d6d0e26 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -37,7 +37,7 @@
path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: xltys1995
+ pwd: xltys2024
swagger:
enable: false
diff --git a/src/main/resources/application-loc.yml b/src/main/resources/application-loc.yml
index bf99810..dfe8d08 100644
--- a/src/main/resources/application-loc.yml
+++ b/src/main/resources/application-loc.yml
@@ -37,7 +37,7 @@
path: stock/out/@pom.build.finalName@/logs
super:
- pwd: xltys1995
+ pwd: xltys2024
swagger:
enable: false
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 60f2b03..3422869 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -37,7 +37,7 @@
path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: xltys1995
+ pwd: xltys2024
swagger:
enable: false
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0e0e3f2..22524fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: dev
\ No newline at end of file
+ active: loc
\ No newline at end of file
diff --git a/src/main/webapp/static/js/orderLog/order.js b/src/main/webapp/static/js/orderLog/order.js
index 112eb9e..c154d9d 100644
--- a/src/main/webapp/static/js/orderLog/order.js
+++ b/src/main/webapp/static/js/orderLog/order.js
@@ -44,22 +44,24 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
+ {field: 'defNumber', align: 'center', title: '鎿嶄綔绯荤粺鍙�', hide: false, width: 120},
+ {field: '鎿嶄綔鍗曟嵁', align: 'center', title: '鎿嶄綔鍗曟嵁', hide: true},
+ {field: '鎿嶄綔绫诲瀷', align: 'center', title: '鎿嶄綔绫诲瀷', hide: true},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'itemName', align: 'center', title: '鏍哥畻涓讳綋'},
+ //{field: 'itemName', align: 'center', title: '鏍哥畻涓讳綋'},
{field: 'docType$', align: 'center', title: '鍗曟嵁绫诲瀷'},
- {field: 'defNumber', align: 'center', title: '涓氬姟绫诲瀷'},
+ //{field: 'defNumber', align: 'center', title: '涓氬姟绫诲瀷'},
//{field: 'postFee', align: 'center', title: '鎬绘暟閲�', minWidth: 130, width: 130},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'createTime$', title: '鍒涘缓鏃堕棿'},
+ {field: 'createTime$', title: '鍒涘缓鏃堕棿', hide: true},
+ {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'},
+ {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: false},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡', hide: true},
{field: 'cstmrName', align: 'center',title: '渚涘簲鍟�/瀹㈡埛缂栫爜', hide: true},
{field: 'tel', align: 'center',title: '浠撳簱', hide: true},
{field: 'operMemb', align: 'center',title: '鍑哄叆搴撶被鍒�', hide: true},
{field: 'salesman', align: 'center',title: '閮ㄩ棬', hide: true},
- {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: true},
- //{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
request: {
pageName: 'curr',
@@ -139,9 +141,9 @@
page: true,
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ //{type: 'numbers'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 140},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
@@ -153,12 +155,15 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸鍨嬪彿'},
+ //{field: 'specs', title: '瑙勬牸鍨嬪彿'},
{field: 'unit', title: '璁￠噺鍗曚綅'},
- {field: 'manu', title: '琛屽彿'},
- {field: 'threeCode', title: '閿�鍞鍗曞彿'},
- {field: 'deadTime', title: '閿�鍞鍗曡鍙�'},
- {field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
+ //{field: 'manu', title: '琛屽彿'},
+ {field: 'threeCode', title: '閿�鍞崟鍙�'},
+ //{field: 'deadTime', title: '鑷敱椤�'},
+ {field: 'processSts$', title: '宸ュ簭'},
+ //{field: 'specs', title: '瑙勬牸'},
+ {field: 'reportQty', title: '涓婃姤鏁伴噺'},
+ //{field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
]],
request: {
pageName: 'curr',
@@ -185,336 +190,7 @@
}
});
- // 鏄剧ず琛ㄥ崟寮圭獥
- function showEditModel(expTpe) {
- admin.open({
- type: 1,
- title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
- content: $('#editDialog').html(),
- area: '1300px',
- success: function (layero, dIndex) {
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- var isExpAdd = !expTpe;
- // 鍥炴樉鏁版嵁
- form.val('editForm', expTpe);
- if (expTpe) {
- $('#orderNo').attr("disabled", "disabled");
- }
- // 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(orderEditSubmit)', function (data) {
- // 缁勮鏁版嵁
- if (xxDataList.length <= 0) {
- layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
- return false;
- }
- let nList = admin.util.deepClone(xxDataList);
- for (let xi = 0; xi < nList.length; xi++) {
- if (nList[xi].anfme <= 0){
- layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
- return false;
- }
- }
- layer.load(2);
- $.ajax({
- url: baseUrl+"/orderLog/form/" + (isExpAdd?"add":"modify") + "/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- orderId: Number(data.field.id),
- docType: Number(data.field.docType),
- orderNo: data.field.orderNo,
- orderDetlList: nList
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll('loading');
- if (res.code === 200){
- layer.close(dIndex);
- $(".layui-laypage-btn")[0].click();
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- return false;
- });
- // 鏄庣粏琛ㄦ牸
- var xxDataList = [];
- var tbOptions = {
- elem: '#formSSXMTable',
- headers: {token: localStorage.getItem('token')},
- data: xxDataList,
- page: true,
- height: '350px;',
- cellMinWidth: 100,
- cols: [[
- {type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '搴忓垪鐮�', edit: true},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'threeCode', title: '閿�鍞鍗曞彿(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'deadTime', title: '閿�鍞鍗曡鍙�(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- // {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
- // {field: 'unit', title: '鍗曚綅', width: 80},
- {field: 'memo', title: '澶囨敞' , edit: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
- ]],
- done: function (res) {
- $(layero).find('.layui-table-view').css('margin', '0');
- },
- size: ''
- };
- if (!isExpAdd) {
- $.ajax({
- url: baseUrl+"/orderLog/detl/all/auth?orderId=" + expTpe.id,
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- async: false,
- success: function (res) {
- if (res.code === 200){
- xxDataList = res.data;
- tbOptions.data = xxDataList;
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- })
- }
- var insTbSSXM = table.render(tbOptions);
- // 宸ュ叿鏉＄偣鍑讳簨浠�
- table.on('tool(formSSXMTable)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'edit') {
- showEditModel2(data);
- } else if (layEvent === 'del') {
- layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- layer.close(i);
- for (var j = 0; j < xxDataList.length; j++) {
- if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) {
- xxDataList.splice(j, 1);
- break;
- }
- }
- insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- });
- }
- });
- // 鏄庣粏鏁版嵁淇敼
- table.on('edit(formSSXMTable)', function (obj) {
- let index = obj.tr.attr("data-index");
- let data = xxDataList[index];
- if (obj.field === 'anfme'){
- let vle = Number(obj.value);
- if (isNaN(vle)) {
- layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
- return false;
- } else {
- if (vle <= 0) {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
- return false;
- }
- }
- }
- data[obj.field] = obj.value;
- insTbSSXM.reload({data: xxDataList});
- });
- $('#matAddBtnComment').click(function () {
- showEditModel2();
- });
-
- // 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
- function showEditModel2(exp) {
- admin.open({
- type: 1,
- offset: '150px',
- area: '680px',
- title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
- content: $('#matEditDialog').html(),
- success: function (layero, dIndex) {
- // 鍥炴樉鏁版嵁
- form.val('matEditForm', exp);
- // 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(matEditSubmit)', function (data) {
- let selectList = matXmSelect.getValue();
- for (let i = 0; i<selectList.length; i++) {
- let item = selectList[i];
- // 鏌ヨ鐗╂枡璇︽儏
- $.ajax({
- url: baseUrl+"/mat/covert/"+item.value+"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- async: false,
- success: function (res) {
- if (res.code === 200){
- xxDataList.push(res.data);
- insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- })
- }
- layer.close(dIndex);
- return false;
- });
- // 娓叉煋鐗╂枡閫夋嫨
- var matXmSelect = xmSelect.render({
- el: '#mat',
- style: {
- width: '340px',
- },
- autoRow: true,
- toolbar: { show: true },
- filterable: true,
- remoteSearch: true,
- remoteMethod: function(val, cb, show){
- $.ajax({
- url: baseUrl+"/mat/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- })
- // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
-
- }
- });
- }
-
- // 鍒犻櫎鍗曟嵁
- function doDel(orderId) {
- layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- layer.close(i);
- layer.load(2);
- $.ajax({
- url: baseUrl+"/orderLog/delete/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- orderId: orderId
- },
- method: 'POST',
- success: function (res) {
- layer.closeAll('loading');
- if (res.code === 200){
- if (insTbCount === 0) {
- insTb.reload({page: {curr: 1}});
- } else {
- $(".layui-laypage-btn")[0].click();
- }
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
- }
-
- // 涓婁紶瀹℃牳鍗曟嵁
- function doReport(orderId) {
- layer.confirm('纭畾瑕佷笂浼犲崟鎹悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- layer.close(i);
- layer.load(2);
- $.ajax({
- url: baseUrl+"/orderLog/report/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- orderId: orderId
- },
- method: 'POST',
- success: function (res) {
- layer.closeAll('loading');
- if (res.code === 200){
- if (insTbCount === 0) {
- insTb.reload({page: {curr: 1}});
- } else {
- $(".layui-laypage-btn")[0].click();
- }
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
- }
-
- // 淇敼璁㈠崟鐘舵��
- function doModify(orderId, settle) {
- layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
- layer.close(i);
- layer.load(2);
- console.log(orderId);
- console.log(settle);
- $.ajax({
- url: baseUrl+"/orderLog/update/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- id: orderId,
- settle: settle
- },
- method: 'POST',
- success: function (res) {
- layer.closeAll('loading');
- if (res.code === 200){
- if (insTbCount === 0) {
- insTb.reload({page: {curr: 1}});
- } else {
- $(".layui-laypage-btn")[0].click();
- }
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
- }
// 浠诲姟杩芥函
function showWrkTrace(orderId) {
diff --git a/src/main/webapp/views/orderLog/orderLog.html b/src/main/webapp/views/orderLog/orderLog.html
index 5a3ca3b..9803ab4 100644
--- a/src/main/webapp/views/orderLog/orderLog.html
+++ b/src/main/webapp/views/orderLog/orderLog.html
@@ -100,17 +100,7 @@
</div>
</div>
</div>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="operate">
- {{# if (d.settle == 1 || d.settle == 2) { }}
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- {{# if (d.settle == 2) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
- {{# } }}
- {{# } }}
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-report" lay-event="report">涓婃姤</a>
-</script>
+
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
<span class="layui-text">
@@ -297,7 +287,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/orderLog/order.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/orderLog/order.js?v=1" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
--
Gitblit v1.9.1