From 022c1483e1cb87b22742b247f25f8152a010bf2f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 24 七月 2023 19:49:06 +0800
Subject: [PATCH] #入库找库位基础逻辑完成，接口第一次测试完成，测试结果："OK"
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 38 +++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 36 +++++++++++++++++-
src/main/java/com/zy/common/service/CommonService.java | 19 ++-------
src/main/java/com/zy/asrs/service/OpenService.java | 4 ++
5 files changed, 81 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3005376..446a899 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -259,6 +259,44 @@
}
+ /**
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ */
+ @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);
+ }
+
+ /**
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ */
+ @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);
+ }
+
+ /**
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ */
+ @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/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 8d85caf..3381be0 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -52,7 +52,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 21116e1..36cab36 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -54,4 +54,8 @@
void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param);
+ void cs1(String barcode);
+ void cs2();
+ void cs3();
+
}
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 8bcba1e..8164191 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -802,7 +802,7 @@
for (WrkDetl wrkDetl:wrkDetls){
if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
wrkDetl.setInspect(1);
- wrkDetlService.updateById(wrkDetl);
+ wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
wrkDetlsNew.add(wrkDetl);
sign=false;
break;
@@ -887,7 +887,7 @@
for (WrkDetl wrkDetl:wrkDetls){
if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
wrkDetl.setOrigin(matList.getPosition());
- wrkDetlService.updateById(wrkDetl);
+ wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
sign=false;
break;
}
@@ -905,5 +905,37 @@
}
}
+ /*
+ *
+ * */
+ @Override
+ @Transactional
+ public void cs1(String barcode) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 201));
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(201));
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setBarcode(barcode);
+ wrkMast.setWrkSts(42L);
+ wrkMastService.insert(wrkMast);
+ }
+
+ /*
+ *
+ * */
+ @Override
+ @Transactional
+ public void cs2() {
+
+ }
+
+ /*
+ *
+ * */
+ @Override
+ @Transactional
+ public void cs3() {
+
+ }
+
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 98c7487..c71f0c0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -132,23 +132,9 @@
break;
}
}
- String val = String.valueOf(vo.getValue());
- if (Cools.isEmpty(batch)) {
- batch = val;
- } else {
- int year0 = Integer.parseInt(batch.substring(0, 2));
- int month0 = Integer.parseInt(batch.substring(2, 4));
- int year = Integer.parseInt(val.substring(0, 2));
- int month = Integer.parseInt(val.substring(2, 4));
- if (year <= year0) {
- if (month < month0) {
- batch = val;
- }
- }
- }
}
if (sameMatnr) {
- List<String> locNos = locDetlService.getSameDetlToday2(matnr, batch, sRow, eRow);
+ List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
continue;
@@ -291,6 +277,9 @@
locTypeDto.setLocType1((short) 2);
return getLocNo(1, staDescId, sourceStaNo, list, locTypeDto, times);
}
+ if (!sign){
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
--
Gitblit v1.9.1