From 1607086231421efad1dae82c00f044b0b9070532 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 19 一月 2024 18:08:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 2
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 76 +++++-----
src/main/java/com/zy/asrs/entity/BasDevp.java | 7 +
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 61 ++++++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 +
src/main/java/com/zy/asrs/controller/MobileController.java | 1
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 175 ++-----------------------
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 13 +
src/main/resources/mapper/BasDevpMapper.xml | 1
src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 49 ++----
src/main/resources/application.yml | 4
12 files changed, 147 insertions(+), 258 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1cd79f7..a099f85 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -188,6 +188,7 @@
combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setWeight(orderDetl.getWeight());
combMats.add(combMat);
}
if (combMats.size()==0){
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e1b4b0f..b892ae2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -245,7 +245,7 @@
auth(appkey, param, request);
openService.palletizingCompleteS(param);
- return R.ok(param);
+ return R.ok();
}
/**
@@ -293,44 +293,44 @@
}
- /**
- * 娴嬭瘯1 鍏ュ簱鍓嶈緭閫佺嚎鍐欏叆鎵樼洏鐮侊紝216绔欐祴璇曠敤
- */
- @PostMapping("/cs1/auth/v1")
- @AppAuth(memo = "")
- public synchronized R cs1(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.cs1(param.getBarcode());
- return R.ok(param);
- }
-
- /**
- * 娴嬭瘯2 娓呴櫎鎵樼洏鐮侊紝216绔欐祴璇曠敤 Copy
- */
- @PostMapping("/cs2/auth/v1")
- @AppAuth(memo = "")
- public synchronized R cs2(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.cs2();
- return R.ok(param);
- }
-
- /**
- * 娴嬭瘯3
- */
- @PostMapping("/cs3/auth/v1")
+// /**
+// * 娴嬭瘯1 鍏ュ簱鍓嶈緭閫佺嚎鍐欏叆鎵樼洏鐮侊紝216绔欐祴璇曠敤
+// */
+// @PostMapping("/cs1/auth/v1")
// @AppAuth(memo = "")
- public synchronized R cs3(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.cs3();
- return R.ok(param);
- }
+// public synchronized R cs1(@RequestHeader(required = false) String appkey,
+// @RequestBody PalletizingCompleteParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// openService.cs1(param.getBarcode());
+// return R.ok(param);
+// }
+//
+// /**
+// * 娴嬭瘯2 娓呴櫎鎵樼洏鐮侊紝216绔欐祴璇曠敤 Copy
+// */
+// @PostMapping("/cs2/auth/v1")
+// @AppAuth(memo = "")
+// public synchronized R cs2(@RequestHeader(required = false) String appkey,
+// @RequestBody PalletizingCompleteParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// openService.cs2();
+// return R.ok(param);
+// }
+//
+// /**
+// * 娴嬭瘯3
+// */
+// @PostMapping("/cs3/auth/v1")
+//// @AppAuth(memo = "")
+// public synchronized R cs3(@RequestHeader(required = false) String appkey,
+// @RequestBody PalletizingCompleteParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// openService.cs3();
+// return R.ok(param);
+// }
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index bcae39b..1339d82 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -76,6 +76,13 @@
private String canining;
/**
+ * 绌烘澘
+ */
+ @ApiModelProperty(value= "绌烘澘")
+ @TableField("empty_mk")
+ private String emptyMk;
+
+ /**
* 鑳藉嚭
*/
@ApiModelProperty(value= "鑳藉嚭")
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index e726029..a7bf27f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -136,7 +136,7 @@
}
public WrkMastSta(Date now, Integer staStart) {
- this.wrkNo = staStart.longValue()+9999;
+ this.wrkNo = staStart.longValue()+19999L;
this.wrkStart = staStart;
this.wrkEnd = staStart;
this.staStart = staStart;
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index d1d5cfd..b9af2f6 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -40,6 +40,8 @@
// 瑙勬牸
private String specs;
+ private Double weight;
+
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
index cd25e71..022f751 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -5,6 +5,7 @@
import com.zy.asrs.entity.LocDetlRullUpDetail;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.service.LocDetlRullUpDetailService;
import com.zy.asrs.service.OrderService;
import io.swagger.models.License;
@@ -58,40 +59,28 @@
public TrussCombParam(){}
- public TrussCombParam(TrussCombParam trussCombParam, Order order, List<OrderDetl> orderDetlList){
+ public TrussCombParam( WrkDetl wrkDetl){
LocDetlRullUpDetailService locDetlRullUpDetailService = SpringUtils.getBean(LocDetlRullUpDetailService.class);
- this.barcode = trussCombParam.getBarcode();
+ this.barcode = wrkDetl.getBarcode();
this.staStart = 147;
- this.palletizingNo2 = trussCombParam.getPalletizingNo2();
- this.staEnd = trussCombParam.getStaEnd();
- this.boxType = orderDetlList.get(0).getBrand();
- this.uuid = trussCombParam.getBarcode();
- this.orderNo = trussCombParam.getOrderNo();
+ this.palletizingNo2 = 118;
+ this.staEnd = 118;
+ this.boxType = wrkDetl.getBrand();
+ this.uuid = wrkDetl.getBarcode();
+ this.orderNo = wrkDetl.getOrderNo();
List<MatList> matLists = new ArrayList<>();
- for (OrderDetl orderDetl:orderDetlList){
- MatList matList = new MatList();
- matList.setMatnr(orderDetl.getMatnr());
- matList.setMaktx(orderDetl.getMaktx());
- matList.setAnfme(orderDetl.getAnfme().intValue());
- matList.setBatch(orderDetl.getBatch());
- matList.setBoxNo(orderDetl.getBatch());
- matList.setPosition("1");
- matList.setWeight(orderDetl.getWeight());
- matList.setSpecs(orderDetl.getSpecs());
- List<MatDetlList> matDetlLists= new ArrayList<>();
- List<LocDetlRullUpDetail> locDetlRullUpDetails = locDetlRullUpDetailService.selectList(new EntityWrapper<LocDetlRullUpDetail>().eq("uuid", orderDetl.getUnit()));
- for (LocDetlRullUpDetail locDetlRullUpDetail:locDetlRullUpDetails){
- MatDetlList matDetlList = new MatDetlList();
- matDetlList.setBoxNoDetl(locDetlRullUpDetail.getRollNo());
- matDetlList.setWeightDetl(locDetlRullUpDetail.getRollWeight());
- matDetlList.setBatchDetl(locDetlRullUpDetail.getStandby1());
- matDetlList.setSpecsDetl(locDetlRullUpDetail.getStandby2());
- matDetlLists.add(matDetlList);
- }
- matList.setMatDetlList(matDetlLists);
- matLists.add(matList);
- }
+ MatList matList = new MatList();
+ matList.setMatnr(wrkDetl.getMatnr());
+ matList.setMaktx(wrkDetl.getMaktx());
+ matList.setAnfme(wrkDetl.getAnfme().intValue());
+ matList.setBatch(wrkDetl.getBatch());
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition("1");
+ matList.setWeight(wrkDetl.getWeight());
+ matList.setSpecs(wrkDetl.getSpecs());
+ matLists.add(matList);
+
this.matList = matLists;
}
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 680f6f9..1e23c30 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -226,8 +226,8 @@
}
Order order = orderService.selectByNo(param.getOrderNo());
- if (Cools.isEmpty(order)){
- throw new CoolException("鏈煡璇㈠埌姝よ鍗曪紝鍗曞彿锛�"+param.getOrderNo());
+ if (Cools.isEmpty(order) || order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈燂紝鍗曞彿锛�"+param.getOrderNo());
}
DocType docType = docTypeService.selectById(order.getDocType());
if (Cools.isEmpty(docType) || !docType.getDocName().equals("閫�璐у叆搴撳崟")){
@@ -252,6 +252,9 @@
if (!orderBoxNoList.contains(matList.getBatch())){
throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 绠卞彿锛�"+matList.getBatch()+"涓嶅睘浜庢璁㈠崟鎴栬�呭凡缁忓叆搴�");
}else {
+// if (matList.getAnfme() > orderDetls.get(0).getAnfme()) {
+// throw new CoolException("绠卞彿锛�"+orderDetls.get(0).getBatch() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+// }
matListBoxNoList.add(matList.getBoxNo());
}
}
@@ -273,6 +276,7 @@
matnr = mat.getMatnr();
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
+ waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
waitPakin.setModel(orderDetl.getModel()); //鎵规
waitPakin.setSpecs(orderDetl.getSpecs()); //瑙勬牸
waitPakin.setBatch(orderDetl.getBatch()); //鏈ㄧ缂栫爜
@@ -328,6 +332,7 @@
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
+ wrkDetl.setOrderNo(order.getOrderNo());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
@@ -348,6 +353,11 @@
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), orderDetls.get(0).getMatnr(), orderDetls.get(0).getBatch(), orderDetls.get(0).getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
+ orderService.updateSettle(order.getId(), 2L, userId);
}
@Override
@Transactional
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 5cb32fc..40387db 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -803,165 +803,18 @@
@Override
@Transactional
public void palletizingCompleteS(PalletizingCompleteParam param) {
- Long userId = 7776L;//鏉剧洓
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
- }else if (Cools.isEmpty(param.getPalletizingNo())){
- throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
- }else if (Cools.isEmpty(param.getBoxType())){
- throw new CoolException("鍙傛暟锛氭湪绠辩被鍨� boxType涓虹┖");
- }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()!=1){
- throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
}
- ArrayList<String> positions = new ArrayList<>(); //鏈ㄧ浣嶇疆鏌ラ噸 (orgin)
- ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
- //鍒ゆ柇matLists鍙傛暟
- for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
- if (Cools.isEmpty(matList.getMatnr())){
- throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
- }else if (Cools.isEmpty(matList.getPosition())){
- throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鐮佸灈浣嶇疆 position涓虹┖");
- }else if (Cools.isEmpty(matList.getBoxNo())){
- throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 boxNo涓虹┖");
- }else if (Cools.isEmpty(matList.getAnfme()) || matList.getAnfme().equals(0)){
- throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ涓摐绠旀暟閲� anfme涓虹┖");
- }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
- throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細閲嶉噺 weight涓虹┖");
- }
-
- if (!positions.contains(matList.getPosition())){
- positions.add(matList.getPosition());
- }else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ浣嶇疆瀛樺湪閲嶅锛�"+matList.getPosition());
- }
-
- if (!boxNos.contains(matList.getBoxNo())){
- boxNos.add(matList.getBoxNo());
- }else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
- }
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=2){
+ log.error("閫�搴撶爜鍨涘畬鎴愶紝杩斿洖鎵樼洏鐮佹湭鏌ヨ鍒板伐浣滄。妗堬紒");
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode鏈煡璇㈠埌宸ヤ綔妗ｆ");
}
-
- BasDevp basDevp = basDevpService.selectById(param.getPalletizingNo2());
- if (Cools.isEmpty(basDevp)){
- throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo="+param.getPalletizingNo2()+"涓嶅瓨鍦�");
- }
- if (Cools.isEmpty(basDevp.getAutoing()) || !basDevp.getAutoing().equals("Y")){
- throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄嚜鍔ㄧ姸鎬�");
- }
- if (Cools.isEmpty(basDevp.getLoading()) || !basDevp.getLoading().equals("Y")){
- throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄湁鐗╃姸鎬�");
- }
-// if (Cools.isEmpty(basDevp.getCanining()) || !basDevp.getCanining().equals("Y")){
-// throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄兘鍏ョ姸鎬�");
-// }
-
-
-
-
-// if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
-// || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
-// || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
-// throw new CoolException("鎵樼洏鏉＄爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭");
-// }
-//
-//
-// Date now = new Date();
-// List<WaitPakin> waitPakins = new ArrayList<>();
-// String matnr = null;
-// for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
-// long rollUp = new Date().getTime();
-// Mat mat = matService.selectByMatnr(matList.getMatnr());
-// if (Cools.isEmpty(mat)) {
-// throw new CoolException(matList.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
-// }
-// matnr = mat.getMatnr();
-// WaitPakin waitPakin = new WaitPakin();
-// waitPakin.sync(mat);
-// waitPakin.setModel(matList.getBatch()); //鎵规
-// waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
-// waitPakin.setBatch(matList.getBoxNo()); //鏈ㄧ缂栫爜
-// waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
-// waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
-// waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
-// waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
-// waitPakin.setAnfme(matList.getAnfme().doubleValue()); // 鏈ㄧ涓摐绠旀暟閲�
-// waitPakin.setStatus("Y"); // 鐘舵��
-// waitPakin.setAppeUser(userId);
-// waitPakin.setAppeTime(now);
-// waitPakin.setModiUser(userId);
-// waitPakin.setModiTime(now);
-// waitPakin.setRollUp(rollUp);
-// if (!Cools.isEmpty(matList.getMatDetlList())){
-// for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
-// LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
-// locDetlRullUpDetail.setUuid(rollUp);
-// locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
-// locDetlRullUpDetail.setRollWeight(matDetlList.getWeightDetl().toString());
-// locDetlRullUpDetailService.insert(locDetlRullUpDetail);
-// }
-// }
-// if (!waitPakinService.insert(waitPakin)) {
-// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
-// }
-// waitPakins.add(waitPakin);
-// }
-// LocTypeDto locTypeDto = new LocTypeDto();
-// locTypeDto.setLocType1((short)1);
-//
-// StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo2(), matnr,null,null, locTypeDto);
-//
-// int workNo = dto.getWorkNo();
-// // 鐢熸垚宸ヤ綔妗�
-// WrkMast wrkMast = new WrkMast();
-// wrkMast.setWrkNo(workNo);
-// wrkMast.setIoTime(new Date());
-// wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
-// wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
-// wrkMast.setIoPri(13D); // 浼樺厛绾�
-// wrkMast.setCrnNo(dto.getCrnNo());
-// wrkMast.setSourceStaNo(dto.getSourceStaNo());
-// wrkMast.setStaNo(dto.getStaNo());
-// wrkMast.setLocNo(dto.getLocNo());
-// wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
-// wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
-// wrkMast.setPicking("N"); // 鎷ｆ枡
-// wrkMast.setExitMk("N"); // 閫�鍑�
-// wrkMast.setEmptyMk("N"); // 绌烘澘
-// wrkMast.setLinkMis("Y");
-// wrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
-// // 鎿嶄綔浜哄憳鏁版嵁
-// wrkMast.setAppeTime(now);
-// wrkMast.setModiTime(now);
-// boolean res = wrkMastService.insert(wrkMast);
-// if (!res) {
-// throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
-// }
-// // 鐢熸垚宸ヤ綔妗ｆ槑缁�
-// waitPakins.forEach(waitPakin -> {
-// WrkDetl wrkDetl = new WrkDetl();
-// wrkDetl.sync(waitPakin);
-// wrkDetl.setWrkNo(wrkMast.getWrkNo());
-// wrkDetl.setIoTime(wrkMast.getIoTime());
-// wrkDetl.setAppeTime(now);
-// wrkDetl.setModiTime(now);
-// if (!wrkDetlService.insert(wrkDetl)) {
-// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
-// }
-// });
-// // 鏇存柊鐩爣搴撲綅鐘舵��
-// LocMast locMast = locMastService.selectById(dto.getLocNo());
-// if (locMast.getLocSts().equals("O")){
-// locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
-// locMast.setModiTime(now);
-// if (!locMastService.updateById(locMast)){
-// throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
-// }
-// } else {
-// throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
-// }
+ wrkMast.setSheetNo("4");
+ wrkMastService.updateById(wrkMast);
}
@@ -1220,14 +1073,14 @@
@Transactional
public void cs3() {
//鎷嗙洏
- WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),119);
- wrkMastSta1.setType(2);
- wrkMastSta1.setWrkType(2);
- wrkMastStaService.insert(wrkMastSta1);
- WrkMastSta wrkMastSta2 = new WrkMastSta(new Date(),121);
- wrkMastSta2.setType(2);
- wrkMastSta2.setWrkType(2);
- wrkMastStaService.insert(wrkMastSta2);
+// WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),119);
+// wrkMastSta1.setType(2);
+// wrkMastSta1.setWrkType(2);
+// wrkMastStaService.insert(wrkMastSta1);
+// WrkMastSta wrkMastSta2 = new WrkMastSta(new Date(),121);
+// wrkMastSta2.setType(2);
+// wrkMastSta2.setWrkType(2);
+// wrkMastStaService.insert(wrkMastSta2);
}
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
diff --git a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
index d872d34..dd86582 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.WrkMastSta;
import com.zy.asrs.entity.param.BalconyWrkMastParam;
import com.zy.asrs.entity.param.TrussCombParam;
import com.zy.asrs.service.*;
@@ -21,7 +22,9 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import sun.security.smartcardio.SunPCSC;
+import java.util.Date;
import java.util.List;
/**
@@ -46,7 +49,7 @@
@Autowired
private BasDevpService basDevpService;
@Autowired
- private OrderService orderService;
+ private WrkMastStaService wrkMastStaService;
@Value("${srHangJia.url}")
private String srHangJiaUrl;
@@ -62,7 +65,8 @@
return FAIL;
}
BasDevp basDevp131 = basDevpService.selectById(131);
- if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y") || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000)){
+ if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y")
+ || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000) || basDevp131.getReportSign()!=0){
return FAIL;
}
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
@@ -74,6 +78,11 @@
if (Cools.isEmpty(wrkDetls) || wrkDetls.size()!=1){
return FAIL;
}
+ WrkDetl wrkDetl = wrkDetls.get(0);
+ if (Cools.isEmpty(wrkDetl) || Cools.isEmpty(wrkDetl.getOrigin()) || Cools.isEmpty(wrkDetl.getBatch())
+ || Cools.isEmpty(wrkDetl.getBrand())){
+ return FAIL;
+ }
BasDevp basDevp118 = basDevpService.selectById(118);
if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 ){
return FAIL;
@@ -83,25 +92,41 @@
return FAIL;
}
- if (basDevp118.getLoading().equals("Y")){
+ if (basDevp118.getLoading().equals("Y") && basDevp118.getEmptyMk().equals("Y")){
//鐢熸垚鏈烘鑷備换鍔�
-// TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
-// try{
-// ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
-// if (success.getCode()!=200){
-// throw new CoolException("妗佹灦涓婁綅杞欢閫�搴撳け璐�");
-// }
-// } catch (Exception e){
-// throw new CoolException("妗佹灦涓婁綅杞欢閫�搴撳け璐�");
-// }
- }else {
- //鐢熸垚鎷嗙洏浠诲姟
+ TrussCombParam trussCombParam = new TrussCombParam(wrkDetl);
+ try{
+ ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
+ if (success.getCode()!=200){
+ log.error("妗佹灦涓婁綅杞欢閫�搴撳け璐�");
+ return FAIL;
+ }else {
+ wrkMast.setSheetNo("3");
+ wrkMastService.updateById(wrkMast);
+ basDevp.setReportSign(3);
+ basDevpService.updateById(basDevp);
+ basDevp118.setReportSign(3);
+ basDevpService.updateById(basDevp118);
+ }
+ return SUCCESS;
+ } catch (Exception e){
+ log.error("妗佹灦涓婁綅杞欢閫�搴撳け璐�"+e);
+ return FAIL;
+ }
+ }else if (!basDevp118.getLoading().equals("Y") ){
+ WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",staNo + 19999L));
+ if (Cools.isEmpty(wrkMastSta)){
+ //鐢熸垚鎷嗙洏浠诲姟
+ WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staNo);
+ wrkMastSta1.setType(2); //绫诲瀷 1:闈炵┖ 2:绌烘澘
+ wrkMastSta1.setWrkType(2); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ wrkMastStaService.insert(wrkMastSta1);
+ }
+ return SUCCESS;
}
-
-//
}catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+e);
+ log.error("閫�璐у叆搴撴満姊拌噦鍙栬揣寮傚父锛侊紒锛�"+e);
return FAIL;
}
return FAIL;
@@ -119,7 +144,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getString("result").equals("Y")) {
+ if (jsonObject.getInteger("Code").equals(200)) {
success = true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+srHangJiaUrl+erpPath, JSON.toJSONString(combParam), response);
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index cf5f958..8207b1c 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -49,9 +49,6 @@
public ReturnT<String> start(int staNo) {
try {
- if(true){
- return FAIL;
- }
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
Integer staEnd = getStaEnd(staNo);
@@ -67,8 +64,8 @@
if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0 ) || basDevpEnd.getWrkNo()>10000 || basDevpEnd.getReportSign()!=0){
return FAIL;
}
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
- if (!Cools.isEmpty(wrkMast1) && wrkMast1.getWrkSts()==51) return FAIL;
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd).eq("wrk_sts",51L));
+ if (!Cools.isEmpty(wrkMast1)) return FAIL;
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
@@ -83,6 +80,9 @@
singleMountUnstackingCompleteParam.setStaStart(staNo);
singleMountUnstackingCompleteParam.setStaEnd(staEnd);
ReturnT<String> result = null;
+ if (true){
+ return FAIL;
+ }
result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
// System.out.println(result);
// if (true){
@@ -112,7 +112,8 @@
basDevp.setReportSign(1);
basDevpService.updateById(basDevp);
basDevpEnd.setReportSign(1);
- basDevpService.updateById(basDevp);
+ basDevpService.updateById(basDevpEnd);
+
return SUCCESS;
}else {
log.error("鎷嗗灈淇℃伅涓婁紶澶辫触");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1d0d5f8..5ec4cdd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -68,10 +68,10 @@
# 鍑哄簱涓婃姤
outPath: EosServer/PluginGateway.ashx?pluginid=DataIOHttp&func=senddata&userno=ASRS&sign=5DD885999945BA2F3DC9A61F1B857DB3&dataname=cpckwc
srHangJia:
- url: 192.168.18.209:16126
+ url: 192.168.18.229:16126
# 鎷嗗灈淇℃伅涓婁紶
reportOutPath: api/DepalletizingInfo/Post
# 鐮佸灈淇℃伅涓婁紶
reportInPath: api/PalletizingInfo/Post
loc-move:
- move-all: true
\ No newline at end of file
+ move-all: false
\ No newline at end of file
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 9d97489..7cd9d8e 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -42,6 +42,7 @@
<result column="gross_wt" property="grossWt" />
<result column="cart_pos" property="cartPos" />
<result column="report_sign" property="reportSign" />
+ <result column="empty_mk" property="emptyMk" />
</resultMap>
--
Gitblit v1.9.1