From 25c7cdf3ea9c4e63f16bbb52ce40e28bc65dc87c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 13 九月 2025 11:08:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 15 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 390 ++++++++++++++++++++++++++-----------------
src/main/java/com/zy/asrs/controller/OutController.java | 46 +++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 61 ++++++
src/main/resources/license.lic | 0
src/main/java/com/zy/asrs/service/OpenService.java | 7
src/main/resources/application.yml | 4
7 files changed, 343 insertions(+), 180 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f3a5d9b..91f897d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -493,7 +493,7 @@
* 閫�搴撳崟锛堝嚭搴擄級
*/
@PostMapping("/returnOrder/auth/v1")
- @AppAuth(memo = "閫�搴撳崟鍗曟嵁涓嬪彂")
+ @AppAuth(memo = "姝ｅ父閫�搴撳崟鍗曟嵁涓嬪彂")
public synchronized R returnOrder(@RequestHeader(required = false) String appkey,
@RequestBody ReturnOrderConfirmParam param,
HttpServletRequest request) {
@@ -502,6 +502,19 @@
return R.ok(param);
}
+ /**
+ * 閫�搴撳崟锛堝嚭搴擄級
+ */
+ @PostMapping("/unqualifiedOrder/auth/v1")
+ @AppAuth(memo = "涓嶅悎鏍煎搧閫�搴撳崟鍗曟嵁涓嬪彂")
+ public synchronized R unqualifiedOrder(@RequestHeader(required = false) String appkey,
+ @RequestBody ReturnOrderConfirmParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.unqualifiedOrder(param);
+ return R.ok(param);
+ }
+
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 379b1a9..81a5510 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -56,12 +56,14 @@
Thread.sleep(200);
return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
}
+
@PostMapping("/getMesOrder/auth")
@ManagerAuth
public R getMesOrder() {
List<String> orderNoList = orderService.getOrderNosByDocType(25L);
return R.ok().add(orderNoList);
}
+
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
public R pakoutPreview(@RequestBody List<Long> ids) {
@@ -105,11 +107,14 @@
// 鑾峰彇鍑哄簱鍙�
List<Integer> staNos = new ArrayList<>();
if (order.getDocType() == 21) {
- staNos.add(3077); staNos.add(3106);
+ staNos.add(3077);
+ staNos.add(3106);
} else if (order.getDocType() == 22) {
staNos.add(2041);
} else if (order.getDocType() == 23) {
- staNos.add(3092); staNos.add(3102); staNos.add(3095);
+ staNos.add(3092);
+ staNos.add(3102);
+ staNos.add(3095);
}
// 鍘婚噸 key锛岄伩鍏嶇浉鍚� loc+unit+model 閲嶅鏄剧ず
@@ -147,13 +152,13 @@
return R.parse(BaseRes.PARAM);
}
List<LocDto> locDtos = new ArrayList<>();
- for (Long id : ids){
+ for (Long id : ids) {
Order order = orderService.selectById(id);
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
for (OrderDetl orderDetl : orderDetls) {
- LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
- orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
+ LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getModel(), orderDetl.getSpecs(),
+ orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getBarcode(), orderDetl.getOrderNo(), orderDetl.getAnfme());
locDto.setOrderDetlId(orderDetl.getId());
locDto.setTkType(orderDetl.getTkType());
locDtos.add(locDto);
@@ -235,9 +240,15 @@
if (one != null) {
// 鍒ゆ柇鏄惁涓虹洏鐐瑰崟锛坉ocType == 23锛夛紝濡傛灉涓嶆槸鍒欐牎楠屽悎鏍兼��
Order order = orderService.selectByNo(stockOutParam.getOrderNo());
- if ( order.getDocType() != 23) {
- if (!"鍚堟牸".equals(one.getThreeCode())) {
- throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸: " + one.getThreeCode());
+ if (order.getDocType() != 23) {
+ if (order.getDocType() == 26 || order.getDocType() == 27) {
+ if ("鍚堟牸".equals(one.getThreeCode())) {
+ throw new CoolException(one.getModel() + "鍗锋槸鍚堟牸: " + one.getThreeCode());
+ }
+ } else {
+ if (!"鍚堟牸".equals(one.getThreeCode())) {
+ throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸: " + one.getThreeCode());
+ }
}
}
@@ -251,10 +262,16 @@
.eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
if ("F".equals(locMast.getLocSts()) || "D".equals(locMast.getLocSts())) {
Order order = orderService.selectByNo(stockOutParam.getOrderNo());
+ IoWorkType ioWorkType = (order.getDocType() != null && order.getDocType() == 23)
+ ? IoWorkType.CHECK_OUT : null;
+ if (order.getDocType() != null) {
+ if (order.getDocType() == 26 || order.getDocType() == 27) {
+ ioWorkType = IoWorkType.ALL_OUT;
+ }
+ }
workService.stockOut(staNo, locDetlDtos,
- order.getDocType() != null && order.getDocType() == 23
- ? IoWorkType.CHECK_OUT : null,
- getUserId(),optionValue);
+ ioWorkType,
+ getUserId(), optionValue);
} else {
throw new CoolException("鎵�閫夊簱浣嶇姸鎬佷笉涓篎/D锛屽簱浣嶅彿锛�" +
locMast.getLocNo() + "锛屽綋鍓嶇姸鎬侊細" +
@@ -269,7 +286,6 @@
}
-
@PostMapping("/out/refund/loc/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R refundLoc(@RequestBody List<LocDto> locDtos) throws InterruptedException {
@@ -279,7 +295,7 @@
long nowOrderNo = System.currentTimeMillis();
Order order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- "TK"+nowOrderNo, // 璁㈠崟缂栧彿
+ "TK" + nowOrderNo, // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
@@ -318,11 +334,11 @@
throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
}
// 鍗曟嵁鏄庣粏妗�
- int i=0;
+ int i = 0;
List<LocDto> locDtosList = new ArrayList<>();
List<String> batchList = new ArrayList<>();
for (LocDto locDto : locDtos) {
- if (!batchList.contains(locDto.getBatch())){
+ if (!batchList.contains(locDto.getBatch())) {
batchList.add(locDto.getBatch());
locDtosList.add(locDto);
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index da9ddc7..abbf38d 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -11,6 +11,7 @@
/**
* GWMS璇锋眰ZWMS鐢熸垚鍏ュ簱浠诲姟
+ *
* @return 鐩爣淇℃伅
*/
R gwmsGenerateInventory(GwmsGenerateInventoryDto param);
@@ -41,7 +42,7 @@
R dd(TbParam param);
/**
- *GWMS鍒拌揪鐩爣绔欑偣璇锋眰ZWCS鎵ц鍏ュ簱
+ * GWMS鍒拌揪鐩爣绔欑偣璇锋眰ZWCS鎵ц鍏ュ簱
*/
String crnExecute(CrnExecuteParam param);
@@ -132,6 +133,7 @@
/**
* 鍚屾鍟嗗搧淇℃伅
+ *
* @param param
*/
void syncMat(MatSyncParam param);
@@ -143,6 +145,7 @@
void balconyComplete(LabellerMatParam param);
void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param);
+
void palletizingCompleteS(PalletizingCompleteParam param);
void singleUnstackingComplete(SingleUnstackingCompleteParam param);
@@ -158,5 +161,5 @@
R returnOrder(ReturnOrderConfirmParam param);
-
+ R unqualifiedOrder(ReturnOrderConfirmParam param);
}
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 8879063..f68352e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2346,7 +2346,7 @@
@Transactional
public R returnOrder(ReturnOrderConfirmParam param) {
if (Cools.isEmpty(param.getOrderNumber())) {
- param.setOrderNumber("THCK" + snowflakeIdWorker.nextId() + "");
+ param.setOrderNumber("THCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
}
// 1. 鏌ヨ鍗曟嵁鏄惁瀛樺湪
Order order = orderMapper.selectOrderByOrderNo(param.getOrderNumber());
@@ -2364,12 +2364,63 @@
orderMapper.insert(order);
} else {
// 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
- order.setStatus(1);
+ order.setStatus(2);
orderMapper.updateById(order);
}
- orderDetlMapper.delete(
- new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNumber())
- );
+
+
+ // 2. 涓�涓�瀵瑰簲閬嶅巻
+ List<ReturnOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
+
+ for (int i = 0; i < volList.size(); i++) {
+ ReturnOrderConfirmParam.VolumeNumber vn = volList.get(i);
+
+ // 鏌ヨ鏄惁宸插瓨鍦ㄨ detl
+ OrderDetl detl = orderDetlMapper.selectByOrderNoAndPkgGroupNoAndVolumeNo(
+ param.getOrderNumber(), param.getPackageGroupNo(), vn.getVolumeNumber()
+ );
+
+ if (detl == null) {
+ detl = new OrderDetl();
+ detl.setOrderId(order.getId());
+ detl.setOrderNo(param.getOrderNumber());
+ detl.setCreateTime(new Date());
+ detl.setAnfme(1.0);
+ detl.setBrand(param.getPackageGroupNo()); // 鍖呰缁勫彿
+ detl.setModel(vn.getVolumeNumber()); // 鍗峰彿
+ orderDetlMapper.insert(detl);
+ }
+ }
+
+ return R.ok("缁勮揣纭鎴愬姛");
+ }
+
+ @Override
+ @Transactional
+ public R unqualifiedOrder(ReturnOrderConfirmParam param) {
+ if (Cools.isEmpty(param.getOrderNumber())) {
+ param.setOrderNumber("UQCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
+ }
+ // 1. 鏌ヨ鍗曟嵁鏄惁瀛樺湪
+ Order order = orderMapper.selectOrderByOrderNo(param.getOrderNumber());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ if (order == null) {
+ // 1.1 涓嶅瓨鍦紝鏂板缓鍗曟嵁
+ order = new Order();
+ order.setOrderNo(param.getOrderNumber());
+ order.setStatus(1);
+ order.setOrderTime(sdf.format(new Date()));
+ order.setCreateTime(new Date());
+ order.setSettle(1L);
+ order.setDocType(27L);
+ orderMapper.insert(order);
+ } else {
+ // 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
+ order.setStatus(2);
+ orderMapper.updateById(order);
+ }
+
// 2. 涓�涓�瀵瑰簲閬嶅巻
List<ReturnOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 53da495..1d43354 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -44,16 +44,34 @@
private static final int DEFAULT_ROW_NO_TYPE = 1;
// 鍫嗗灈鏈烘槧灏勪竴妤肩殑鍏ュ簱鍑哄簱绔欑偣
- private static final Map<Integer,List<Integer>> crnMapNo;
+ private static final Map<Integer, List<Integer>> crnMapNo;
static {
crnMapNo = new HashMap<>();
- crnMapNo.put(1,new ArrayList<Integer>(){{add(3001);add(3002);}});
- crnMapNo.put(2,new ArrayList<Integer>(){{add(3004);add(3003);}});
- crnMapNo.put(3,new ArrayList<Integer>(){{add(3005);add(3006);}});
- crnMapNo.put(4,new ArrayList<Integer>(){{add(3007);add(3008);}});
- crnMapNo.put(5,new ArrayList<Integer>(){{add(3010);add(3009);}});
- crnMapNo.put(6,new ArrayList<Integer>(){{add(3011);add(3012);}});
+ crnMapNo.put(1, new ArrayList<Integer>() {{
+ add(3001);
+ add(3002);
+ }});
+ crnMapNo.put(2, new ArrayList<Integer>() {{
+ add(3004);
+ add(3003);
+ }});
+ crnMapNo.put(3, new ArrayList<Integer>() {{
+ add(3005);
+ add(3006);
+ }});
+ crnMapNo.put(4, new ArrayList<Integer>() {{
+ add(3007);
+ add(3008);
+ }});
+ crnMapNo.put(5, new ArrayList<Integer>() {{
+ add(3010);
+ add(3009);
+ }});
+ crnMapNo.put(6, new ArrayList<Integer>() {{
+ add(3011);
+ add(3012);
+ }});
}
@Autowired
@@ -112,7 +130,7 @@
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
// List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), param.getList().get(0).getMatnr(),null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), param.getList().get(0).getMatnr(), null, null, locTypeDto);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -157,20 +175,20 @@
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiUser(userId);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiUser(userId);
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto.getLocNo();
}
@@ -185,46 +203,47 @@
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
LocDetl one = new LocDetl();
// if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
- one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
- .eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
+ one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo())
+ .eq("brand", paramLocDetl.getBrand()).eq("model", paramLocDetl.getModel()));
// selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
- if(paramLocDetl.getMatnr().equals("绌虹")){
- one= locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo()));
+ if (paramLocDetl.getMatnr().equals("绌虹")) {
+ one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo()));
}
- if (null != one && !paramLocDetl.getMatnr().equals("绌虹")) {
- if(!"鍚堟牸".equals(one.getThreeCode())) {
- throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸:" + one.getThreeCode() );
- }
- locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
- }else{
- locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
+ if (null != one && !paramLocDetl.getMatnr().equals("绌虹")) {
+ if (!"鍚堟牸".equals(one.getThreeCode())) {
+ throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸:" + one.getThreeCode());
}
+ locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
+ } else {
+ locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
+ }
// }
}
if (!locDetlDtos.isEmpty()) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
stockOut(staNo, locDetlDtos, null, userId);
- }else {
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ } else {
+ throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
}
} else {
throw new CoolException("搴撳瓨涓嶅瓨鍦�");
}
}
+
@Override
@Transactional
public void startupFullTakeStoreOrder(StockOutParam param, Long userId) {
- if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls())){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls())) {
throw new CoolException("鍙傛暟涓虹┖");
}
- if (Cools.isEmpty(param.getOrderNo())){
+ if (Cools.isEmpty(param.getOrderNo())) {
throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
}
DocType docType = docTypeService.selectOrAdd("鎵嬪姩鍑哄簱鍗�", Boolean.FALSE);
Order order = orderService.selectByNo(param.getOrderNo());
- if (Cools.isEmpty(order)){
+ if (Cools.isEmpty(order)) {
Date now = new Date();
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
@@ -269,7 +288,7 @@
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
List<StockOutParam.LocDetl> locDetls = param.getLocDetls();
- int i=0;
+ int i = 0;
for (StockOutParam.LocDetl locDetl : locDetls) {
i++;
Mat mat = matService.selectByMatnr(locDetl.getMatnr());
@@ -309,10 +328,11 @@
// }
} else {
- throw new CoolException("璁㈠崟鍙烽噸澶嶏紝璁㈠崟"+param.getOrderNo()+"宸插瓨鍦紒锛侊紒");
+ throw new CoolException("璁㈠崟鍙烽噸澶嶏紝璁㈠崟" + param.getOrderNo() + "宸插瓨鍦紒锛侊紒");
}
}
+
@Transactional
@Override
public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
@@ -375,7 +395,7 @@
wrkMast.setLinkMis("N");
wrkMast.setSheetNo("0");
// wrkMast.setMemo(groupOrderNumber);
- if (staDesc.getStnNo()<118 || staDesc.getStnNo()>121){
+ if (staDesc.getStnNo() < 118 || staDesc.getStnNo() > 121) {
wrkMast.setSheetNo("3");
}
wrkMast.setBarcode(locMast.getBarcode());
@@ -384,26 +404,28 @@
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+dto.getLocNo());
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
- if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
+ if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
+ continue;
+ }
WrkDetl wrkDetl = new WrkDetl();
List<OrderDetl> orderDetl = orderDetlService.selectByBrand(detlDto.getLocDetl().getBrand());
wrkDetl.sync(detlDto.getLocDetl());
for (OrderDetl orderDetlDto : orderDetl) {
- if(orderDetlDto.getSupp() != null){
+ if (orderDetlDto.getSupp() != null) {
wrkDetl.setSupp(orderDetlDto.getSupp());
}
- if(orderDetlDto.getMemo() != null){
+ if (orderDetlDto.getMemo() != null) {
wrkDetl.setMemo(orderDetlDto.getMemo());
}
}
wrkDetl.setOrderNo(detlDto.getOrderNo()); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(now);
- Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
+ Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
wrkDetl.setAnfme(anfme); // 鏁伴噺
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
@@ -415,17 +437,17 @@
// 淇敼璁㈠崟鏄庣粏
orderDetlMapper.updateOrderDetlByGroupNo(detlDto.getOrderNo(), detlDto.getLocDetl().getBrand(), 1);
// 淇敼璁㈠崟鐘舵��
- orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(),2L, userId);
+ orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(), 2L, userId);
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts(ioType==101?"R":"P");
+ locMast.setLocSts(ioType == 101 ? "R" : "P");
locMast.setModiUser(userId);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+dto.getLocNo());
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo());
}
} else {
throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
@@ -436,7 +458,7 @@
@Override
@Transactional
- public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId,String groupOrderNumber) {
+ public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId, String groupOrderNumber) {
Date now = new Date();
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
@@ -463,6 +485,8 @@
ioType = dto.isAll() ? 101 : 103;
} else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
ioType = 107;
+ } else if (ioWorkType.equals(IoWorkType.ALL_OUT)) {
+ ioType = 101;
}
assert ioType != null;
// 鑾峰彇搴撲綅
@@ -496,7 +520,7 @@
wrkMast.setLinkMis("N");
wrkMast.setSheetNo("0");
wrkMast.setMemo(groupOrderNumber);
- if (staDesc.getStnNo()<118 || staDesc.getStnNo()>121){
+ if (staDesc.getStnNo() < 118 || staDesc.getStnNo() > 121) {
wrkMast.setSheetNo("3");
}
wrkMast.setBarcode(locMast.getBarcode());
@@ -505,26 +529,28 @@
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+dto.getLocNo());
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
- if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
+ if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
+ continue;
+ }
WrkDetl wrkDetl = new WrkDetl();
List<OrderDetl> orderDetl = orderDetlService.selectByBrand(detlDto.getLocDetl().getBrand());
wrkDetl.sync(detlDto.getLocDetl());
for (OrderDetl orderDetlDto : orderDetl) {
- if(orderDetlDto.getSupp() != null){
+ if (orderDetlDto.getSupp() != null) {
wrkDetl.setSupp(orderDetlDto.getSupp());
}
- if(orderDetlDto.getMemo() != null){
+ if (orderDetlDto.getMemo() != null) {
wrkDetl.setMemo(orderDetlDto.getMemo());
}
}
wrkDetl.setOrderNo(detlDto.getOrderNo()); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(now);
- Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
+ Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
wrkDetl.setAnfme(anfme); // 鏁伴噺
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
@@ -536,17 +562,17 @@
// 淇敼璁㈠崟鏄庣粏
orderDetlMapper.updateOrderDetlByGroupNo(detlDto.getOrderNo(), detlDto.getLocDetl().getBrand(), 1);
// 淇敼璁㈠崟鐘舵��
- orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(),2L, userId);
+ orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(), 2L, userId);
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts(ioType==101?"R":"P");
+ locMast.setLocSts(ioType == 101 ? "R" : "P");
locMast.setModiUser(userId);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+dto.getLocNo());
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo());
}
} else {
throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
@@ -574,34 +600,82 @@
int souresStaNo = 0;
if (taskDto.getStaNo() < 3000) { // 浜屾ゼ
switch (row) {
- case 1: case 2: case 3:
- case 4: souresStaNo = 2062; break;
- case 5: case 6: case 7:
- case 8: souresStaNo = 2065; break;
- case 9: case 10: case 11:
- case 12: souresStaNo = 2068; break;
- case 13: case 14: case 15:
- case 16: souresStaNo = 2070; break;
- case 17: case 18: case 19:
- case 20: souresStaNo = 2073; break;
- case 21: case 22: case 23:
- case 24: souresStaNo = 2076; break;
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ souresStaNo = 2062;
+ break;
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ souresStaNo = 2065;
+ break;
+ case 9:
+ case 10:
+ case 11:
+ case 12:
+ souresStaNo = 2068;
+ break;
+ case 13:
+ case 14:
+ case 15:
+ case 16:
+ souresStaNo = 2070;
+ break;
+ case 17:
+ case 18:
+ case 19:
+ case 20:
+ souresStaNo = 2073;
+ break;
+ case 21:
+ case 22:
+ case 23:
+ case 24:
+ souresStaNo = 2076;
+ break;
default:
}
} else { // 涓�妤�
switch (row) {
- case 1: case 2: case 3:
- case 4: souresStaNo = 3002; break;
- case 5: case 6: case 7:
- case 8: souresStaNo = 3003; break;
- case 9: case 10: case 11:
- case 12: souresStaNo = 3006; break;
- case 13: case 14: case 15:
- case 16: souresStaNo = 3008; break;
- case 17: case 18: case 19:
- case 20: souresStaNo = 3009; break;
- case 21: case 22: case 23:
- case 24: souresStaNo = 3012; break;
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ souresStaNo = 3002;
+ break;
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ souresStaNo = 3003;
+ break;
+ case 9:
+ case 10:
+ case 11:
+ case 12:
+ souresStaNo = 3006;
+ break;
+ case 13:
+ case 14:
+ case 15:
+ case 16:
+ souresStaNo = 3008;
+ break;
+ case 17:
+ case 18:
+ case 19:
+ case 20:
+ souresStaNo = 3009;
+ break;
+ case 21:
+ case 22:
+ case 23:
+ case 24:
+ souresStaNo = 3012;
+ break;
default:
}
}
@@ -634,11 +708,13 @@
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+taskDto.getLocNo());
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + taskDto.getLocNo());
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDto locDto : taskDto.getLocDtos()) {
- if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
+ if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
+ continue;
+ }
OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
if (orderDetl == null) {
orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
@@ -675,11 +751,11 @@
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(taskDto.getLocNo());
if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts(ioType==101?"R":"P");
+ locMast.setLocSts(ioType == 101 ? "R" : "P");
locMast.setModiUser(userId);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+taskDto.getLocNo());
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + taskDto.getLocNo());
}
} else {
throw new CoolException(taskDto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
@@ -693,7 +769,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, null, null, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -726,20 +802,20 @@
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiUser(userId);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiUser(userId);
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto.getLocNo();
}
@@ -756,10 +832,10 @@
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
- throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�");
+ throw new CoolException(locNo + "搴撲綅涓嶅瓨鍦�");
}
- if (!locMast.getLocSts().equals("D")){
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ if (!locMast.getLocSts().equals("D")) {
+ throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
}
// 鑾峰彇婧愮珯
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
@@ -797,7 +873,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
- if (locMast.getLocSts().equals("D")){
+ if (locMast.getLocSts().equals("D")) {
locMast.setLocSts("R");
locMast.setModiUser(userId);
locMast.setModiTime(now);
@@ -821,7 +897,7 @@
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
- throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�");
+ throw new CoolException(locNo + "搴撲綅涓嶅瓨鍦�");
}
// 鑾峰彇婧愮珯
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
@@ -860,7 +936,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
- if (locMast.getLocSts().equals("D")){
+ if (locMast.getLocSts().equals("D")) {
locMast.setLocSts("R");
locMast.setModiUser(1L);
locMast.setModiTime(now);
@@ -880,17 +956,17 @@
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
- .eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
+ LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo())
+ .eq("brand", paramLocDetl.getBrand()).eq("model", paramLocDetl.getModel()));
if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
}
if (!locDetlDtos.isEmpty()) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
- if (locMast.getLocSts().equals("F")){
+ if (locMast.getLocSts().equals("F")) {
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
- }else {
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ } else {
+ throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
}
} else {
throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
@@ -902,14 +978,14 @@
public void locMove(String sourceLocNo, String locNo, Long userId) {
LocMast sourceLoc = locMastService.selectById(sourceLocNo);
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
- if (Cools.isEmpty(sourceLoc)){
+ if (Cools.isEmpty(sourceLoc)) {
throw new CoolException("鏈壘鍒板簱浣�");
}
LocMast loc = locMastService.selectById(locNo);
- if (Cools.isEmpty(loc)){
+ if (Cools.isEmpty(loc)) {
throw new CoolException("鏈壘鍒板簱浣�");
}
- if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))){
+ if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))) {
throw new CoolException("搴撲綅鐘舵�佸凡鏀瑰彉");
}
if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
@@ -928,10 +1004,10 @@
wrkMast.setCrnNo(sourceLoc.getCrnNo());
wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
- wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
+ wrkMast.setFullPlt(Cools.isEmpty(locDetls) ? "N" : "Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
+ wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
wrkMast.setAppeUser(userId);
@@ -962,11 +1038,11 @@
sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
sourceLoc.setModiUser(userId);
sourceLoc.setModiTime(now);
- if (!locMastService.updateById(sourceLoc)){
+ if (!locMastService.updateById(sourceLoc)) {
throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
}
} else {
- throw new CoolException("婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocSts$());
+ throw new CoolException("婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細" + sourceLoc.getLocSts$());
}
// 淇敼鐩爣搴撲綅鐘舵��
if (loc.getLocSts().equals("O")) {
@@ -977,20 +1053,20 @@
throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocSts$());
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + loc.getLocSts$());
}
}
@Override
@Transactional
- public void autoLocMove(String orderNo,String sourceLocNo, String locNo, Long userId) {
+ public void autoLocMove(String orderNo, String sourceLocNo, String locNo, Long userId) {
LocMast sourceLoc = locMastService.selectById(sourceLocNo);
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
- if (Cools.isEmpty(sourceLoc)){
+ if (Cools.isEmpty(sourceLoc)) {
throw new CoolException("鏈壘鍒板簱浣�");
}
LocMast loc = locMastService.selectById(locNo);
- if (Cools.isEmpty(loc)){
+ if (Cools.isEmpty(loc)) {
throw new CoolException("鏈壘鍒板簱浣�");
}
@@ -1009,10 +1085,10 @@
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
wrkMast.setSourceStaNo(crnMapNo.get(sourceLoc.getCrnNo()).get(1)); // 鍑哄簱婧愮珯鐐�
wrkMast.setStaNo(crnMapNo.get(loc.getCrnNo()).get(0)); // 鍏ュ簱鐩爣绔欑偣
- wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
+ wrkMast.setFullPlt(Cools.isEmpty(locDetls) ? "N" : "Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
+ wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
wrkMast.setAppeUser(userId);
@@ -1045,11 +1121,11 @@
sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
sourceLoc.setModiUser(userId);
sourceLoc.setModiTime(now);
- if (!locMastService.updateById(sourceLoc)){
+ if (!locMastService.updateById(sourceLoc)) {
throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
}
} else {
- throw new CoolException("婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocSts$());
+ throw new CoolException("婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細" + sourceLoc.getLocSts$());
}
// 淇敼鐩爣搴撲綅鐘舵��
if (loc.getLocSts().equals("O")) {
@@ -1060,7 +1136,7 @@
throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocSts$());
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + loc.getLocSts$());
}
}
@@ -1068,8 +1144,8 @@
@Transactional
public void completeWrkMast(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
- if (Cools.isEmpty(wrkMast)){
- throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
if (wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
@@ -1077,10 +1153,10 @@
// 鍏ュ簱 + 搴撲綅杞Щ
if (wrkMast.getIoType() < 60) {
wrkMast.setWrkSts(4L);
- // 鍑哄簱
+ // 鍑哄簱
} else if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107 && wrkMast.getIoType() != 109) {
wrkMast.setWrkSts(14L);
- }else{
+ } else {
throw new CoolException("褰撳墠宸ヤ綔绫诲瀷鎴栫姸鎬佹棤娉曞畬鎴�");
}
Date now = new Date();
@@ -1121,7 +1197,9 @@
Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();
while (iterator1.hasNext()) {
LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();
- if (adjust.getCount() == 0) { continue; }
+ if (adjust.getCount() == 0) {
+ continue;
+ }
if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch())) {
if (!locDetl.getAnfme().equals(adjust.getCount())) {
// todo 鐩樼偣璁板綍
@@ -1170,7 +1248,9 @@
// 娣诲姞搴撳瓨
for (LocDetlAdjustParam.LocDetlAdjust adjust : list) {
- if (adjust.getCount() == 0.0D) { continue; }
+ if (adjust.getCount() == 0.0D) {
+ continue;
+ }
Mat mat = matService.selectByMatnr(adjust.getMatnr());
LocDetl locDetl = new LocDetl();
locDetl.sync(mat);
@@ -1222,8 +1302,8 @@
public void cancelWrkMast(String workNo, Long userId) {
Date now = new Date();
WrkMast wrkMast = wrkMastService.selectById(workNo);
- if (Cools.isEmpty(wrkMast)){
- throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
@@ -1237,49 +1317,49 @@
// 搴撲綅杞Щ锛氭簮搴撲綅
LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:"+ wrkMast.getSourceLocNo());
+ throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:" + wrkMast.getSourceLocNo());
}
- locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F");
+ locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F");
locMast.setModiTime(now);
locMast.setModiUser(userId);
locMastService.updateById(locMast);
}
- // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
+ // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
} else if (wrkMast.getWrkSts() == 11) {
locNo = wrkMast.getSourceLocNo();
// 鍑哄簱 ===>> F.鍦ㄥ簱
if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
locSts = "F";
- // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
+ // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
} else if (wrkMast.getIoType() == 110) {
locSts = "D";
- // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
+ // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
} else if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
- locSts = wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F";
+ locSts = wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F";
// 搴撲綅杞Щ锛氱洰鏍囧簱浣�
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:"+ wrkMast.getSourceLocNo());
+ throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:" + wrkMast.getSourceLocNo());
}
locMast.setLocSts("O");
locMast.setModiTime(now);
locMast.setModiUser(userId);
locMastService.updateById(locMast);
}
- }else {
+ } else {
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
}
//鍙栨秷鍏ュ簱宸ヤ綔妗ｆ椂锛屾煡璇㈢粍鎵樿〃锛屽鏋滄湁灏嗙姸鎬佹敼涓哄緟澶勭悊
- if(wrkMast.getIoType() == 1) {
- List<WaitPakin> waitPakins=waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
- for (WaitPakin waitPakin:waitPakins){
+ if (wrkMast.getIoType() == 1) {
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+ for (WaitPakin waitPakin : waitPakins) {
if (!Cools.isEmpty(waitPakin)) {
waitPakin.setIoStatus("N");
waitPakin.setLocNo("");
waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
// .eq("order_no", waitPakin.getOrderNo())
- .eq("zpallet",waitPakin.getZpallet())
+ .eq("zpallet", waitPakin.getZpallet())
.eq("matnr", waitPakin.getMatnr())
.eq("batch", waitPakin.getBatch()));
}
@@ -1293,7 +1373,7 @@
Order order = orderList.get(0);
// 鍥炴粴鍗曟嵁鏄庣粏鐨勭Щ搴撶姸鎬�
List<OrderDetl> orderDetlList1 = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()).eq("specs", wrkMast.getSourceLocNo()));
- for (OrderDetl orderDetl:orderDetlList1) {
+ for (OrderDetl orderDetl : orderDetlList1) {
if (orderDetl.getBeBatch() != null) {
orderDetl.setModel("");
}
@@ -1308,7 +1388,7 @@
orderMapper.updateById(order);
}
} else {
- log.error("鍥炴粴绉诲簱鍗曟嵁寮傚父锛屾棤婧愬簱浣嶆暟鎹細{}",wrkMast.getSourceLocNo());
+ log.error("鍥炴粴绉诲簱鍗曟嵁寮傚父锛屾棤婧愬簱浣嶆暟鎹細{}", wrkMast.getSourceLocNo());
}
}
@@ -1319,31 +1399,31 @@
// }
//鍙栨秷鍑哄簱宸ヤ綔妗ｆ椂锛屾煡璇㈠崟鎹鐞嗚〃锛屽洖婊氫綔涓氫腑鏁伴噺
- if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
// throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
// }
- orderDetlMapper.updateOrderDetlByGroupNo(wrkDetl.getOrderNo(),wrkDetl.getBrand(),0);
+ orderDetlMapper.updateOrderDetlByGroupNo(wrkDetl.getOrderNo(), wrkDetl.getBrand(), 0);
//淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
boolean flag = true;
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
- for(OrderDetl orderDetl : orderDetls){
- if(orderDetl.getWorkQty() > 0){
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo()));
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getWorkQty() > 0) {
flag = false;
}
}
- if(flag){
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
- if(!Cools.isEmpty(order) && order.getSettle()==2){
+ if (flag) {
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()));
+ if (!Cools.isEmpty(order) && order.getSettle() == 2) {
order.setSettle(1L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
}
- if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
+ if (!orderService.update(order, new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()))) {
throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
}
}
@@ -1386,14 +1466,14 @@
// 鍒犻櫎宸ヤ綔妗ｆ槑缁�
boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
}
- if (wrkMast.getIoType()==202 || wrkMast.getIoType()==212){
+ if (wrkMast.getIoType() == 202 || wrkMast.getIoType() == 212) {
return;
}
// 淇敼搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐ワ紝搴撲綅涓嶅瓨鍦�:"+ locNo);
+ throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐ワ紝搴撲綅涓嶅瓨鍦�:" + locNo);
}
locMast.setLocSts(locSts);
locMast.setModiTime(now);
@@ -1408,8 +1488,8 @@
@Transactional
public void pickWrkMast(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
- if (Cools.isEmpty(wrkMast)){
- throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
// 鍏ュ嚭搴撶被鍨嬪垽鏂�
if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
@@ -1487,7 +1567,7 @@
// 鐩爣搴撲綅
LocMast targetLoc = null;
- for (int curRow = rowLastno.getsRow(); curRow<=rowLastno.geteRow(); curRow++) {
+ for (int curRow = rowLastno.getsRow(); curRow <= rowLastno.geteRow(); curRow++) {
if (Utils.isShallowLoc(slaveProperties, curRow)) {
Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
@@ -1546,15 +1626,15 @@
throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
}
// 淇敼搴撲綅鐘舵�� O ===>>> S
- if (targetLoc.getLocSts().equals("O")){
+ if (targetLoc.getLocSts().equals("O")) {
targetLoc.setLocSts("S"); // S.鍏ュ簱棰勭害
targetLoc.setModiUser(userId);
targetLoc.setModiTime(now);
- if (!locMastService.updateById(targetLoc)){
+ if (!locMastService.updateById(targetLoc)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(targetLoc.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(targetLoc.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
// 绂佺敤寮傚父搴撲綅
// locMast.setLocSts("X"); // X.绂佺敤
@@ -1570,19 +1650,19 @@
@Transactional
public void turnMatLocDetl(EmptyPlateOutParam param, Long userId) {
Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("id", param.getMatId()));
- if (Cools.isEmpty(mat)){
+ if (Cools.isEmpty(mat)) {
throw new CoolException("鐩爣搴撲綅鍟嗗搧缂栫爜鏈夎锛�");
}
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getLocDetls().get(0).getMatnr()));
- if (Cools.isEmpty(locDetls) || locDetls.size()<1){
- throw new CoolException("寰呬慨鏀瑰晢鍝佹棤搴撳瓨锛屾棤闇�淇敼锛� 瑙勬牸锛�"+param.getLocDetls().get(0).getMatnr());
+ if (Cools.isEmpty(locDetls) || locDetls.size() < 1) {
+ throw new CoolException("寰呬慨鏀瑰晢鍝佹棤搴撳瓨锛屾棤闇�淇敼锛� 瑙勬牸锛�" + param.getLocDetls().get(0).getMatnr());
}
try {
- locDetlService.updateMatTurn(param.getLocDetls().get(0).getMatnr(),mat.getMatnr());
- }catch (Exception e){
+ locDetlService.updateMatTurn(param.getLocDetls().get(0).getMatnr(), mat.getMatnr());
+ } catch (Exception e) {
throw new CoolException("瀵规暟鎹簱淇敼鍑洪敊锛�");
}
- for (LocDetl locDetl:locDetls){
+ for (LocDetl locDetl : locDetls) {
// 淇濆瓨璋冩暣璁板綍
AdjDetl adjDetl = new AdjDetl();
adjDetl.setLocNo(locDetl.getLocNo());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b2c1f6a..1ca4440 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- #url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghjtasrs
- url: jdbc:sqlserver://192.168.14.137:1433;databasename=ghjtasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghjtasrs
+ #url: jdbc:sqlserver://192.168.14.137:1433;databasename=ghjtasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 72952e9..71c5331 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1