From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index a52b245..0814073 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -4,13 +4,27 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkMastService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+@Slf4j
@Service("basCrnpService")
public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService {
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+
+ /**
+ * 妫�鏌ュ爢鍨涙満鍩虹鍙敤鐘舵�侊紝涓嶆弧瓒虫椂鐩存帴鎶涘嚭涓氬姟寮傚父銆�
+ */
@Override
public BasCrnp checkSiteStatus(Integer crnId) {
BasCrnp crnp = this.selectById(crnId);
@@ -18,11 +32,54 @@
throw new CoolException(crnId + "鍙峰爢鍨涙満涓嶅瓨鍦�");
}
if ("N".equals(crnp.getInEnable())) {
- throw new CoolException("鍫嗗灈鏈轰笉鍙叆");
+ throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙叆");
}
if ("N".equals(crnp.getOutEnable())) {
- throw new CoolException("鍫嗗灈鏈轰笉鍙嚭");
+ throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙嚭");
}
return crnp;
}
+
+ /**
+ * 缁熶竴鏍￠獙鍫嗗灈鏈烘槸鍚﹀彲鍙備笌鍏ュ簱/鍑哄簱鍒嗛厤銆�
+ */
+ @Override
+ public boolean checkSiteError(Integer crnNo, boolean pakin) {
+ BasCrnp crnp = this.selectById(crnNo);
+ if (Cools.isEmpty(crnp)) {
+// log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
+ return false;
+ }
+ if (crnp.getCrnSts() == null || crnp.getCrnSts() != 3) {
+ log.error("{}鍙峰爢鍨涙満闈炶嚜鍔ㄨ繛绾跨姸鎬侊紝鏃犳硶浣滀笟!", crnNo);
+ return false;
+ }
+ if (crnp.getCrnErr() != null && crnp.getCrnErr() != 0) {
+ log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
+ return false;
+ }
+
+ if (pakin) {
+ //鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-10-23 ADD 鏈疄瑁�
+// int maxCount = 2;
+// int storeCount = wrkMastService.getStoreCount(crnNo);
+//
+// if(storeCount >= maxCount){
+// log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
+// return false;
+// }
+
+ if ("N".equals(crnp.getInEnable())) {
+ log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
+ return false;
+ }
+ } else {
+ if ("N".equals(crnp.getOutEnable())) {
+ log.error("{}鍙峰爢鍨涙満涓嶅彲鍑�", crnNo);
+ return false;
+ }
+ }
+
+ return true;
+ }
}
--
Gitblit v1.9.1