From fd6f8822717ae6d32e1aef27f79da567915a2440 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 02 四月 2026 17:14:09 +0800
Subject: [PATCH] 1.设备同步
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 265 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 230 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 3b3fc44..a053cf1 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -8,6 +8,9 @@
import com.core.exception.CoolException;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
+import com.zy.api.entity.CrnProtocol;
+import com.zy.api.entity.DeviceStatusVo;
+import com.zy.api.entity.StationProtocol;
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
@@ -23,15 +26,17 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Slf4j
@Service
public class WcsApiServiceImpl implements WcsApiService {
+
+ private static final Long WCS_SYNC_USER = 9999L;
+ private static final String YES = "Y";
+ private static final String NO = "N";
@Autowired
private BasDeviceService basDeviceService;
@@ -62,6 +67,18 @@
private String createLocMoveTask;
@Autowired
private CommonService commonService;
+
+ @Value("${wcs.address.getDeviceStatus:/openapi/getDeviceStatus}")
+ private String getDeviceStatus;
+ @Value("${wcs.status-sync.method:GET}")
+ private String deviceStatusMethod;
+ @Value("${wcs.switch}")
+ private String switchValue;
+
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasCrnpService basCrnpService;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -123,9 +140,9 @@
// if (!wrkMastService.updateById(mast)) {
// throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
// }
- workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
- return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
+ return workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
+
}
/**
@@ -153,7 +170,7 @@
}else if (!Objects.isNull(params.getType()) && params.getType().equals("move")) {
url = createLocMoveTask;
}
- String response;
+ String response = null;
R r = R.ok();
try {
log.info("涓嬪彂鎼繍浠诲姟缁檞cs="+JSON.toJSONString(params));
@@ -201,29 +218,31 @@
}
}
}
- }else if (wrkMast.getIoType()==101){
+ }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110) {
wrkMast.setWrkSts(12L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
//鍑哄簱涓烘満鍙板伐浣嶆椂锛屽喕缁撶浉瀵规湁鐨勫簱浣�,鍙婄浉閭诲簱浣�
String s = Utils.convertLocFormat(params.getLocNo());
- LocAroundBind bind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
- .eq("b_loc_no", s));
- if (!Objects.isNull(bind)&&Cools.isEmpty(wrkMast.getStaNo())) {
- bind.setFreeze(1);
- locAroundBindService.updateById(bind);
- //鍐荤粨鐩搁偦搴撲綅
- Integer[] aroundIds = freezeLocAround(bind.getOrderNo());
- if (aroundIds != null) {
- for (Integer id : aroundIds) {
- if (id != null && id > 0) {
- LocAroundBind aroundBind = locAroundBindService.selectOne(
- new EntityWrapper<LocAroundBind>()
- .eq("dev_id", bind.getDevId())
- .eq("order_no", id));
- if (aroundBind != null) {
- aroundBind.setFreeze(1);
- locAroundBindService.updateById(aroundBind);
+ if(Cools.isEmpty(wrkMast.getLocNo())){
+ LocAroundBind bind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
+ .eq("b_loc_no", s));
+ if (!Objects.isNull(bind)) {
+ bind.setFreeze(1);
+ locAroundBindService.updateById(bind);
+ //鍐荤粨鐩搁偦搴撲綅
+ Integer[] aroundIds = freezeLocAround(bind.getOrderNo());
+ if (aroundIds != null) {
+ for (Integer id : aroundIds) {
+ if (id != null && id > 0) {
+ LocAroundBind aroundBind = locAroundBindService.selectOne(
+ new EntityWrapper<LocAroundBind>()
+ .eq("dev_id", bind.getDevId())
+ .eq("order_no", id));
+ if (aroundBind != null) {
+ aroundBind.setFreeze(1);
+ locAroundBindService.updateById(aroundBind);
+ }
}
}
}
@@ -233,15 +252,21 @@
}
//TODO 涓婃姤鏄惁鎴愬姛
}else {
- r =R.error();
+ String msg = jsonObject.getString("msg");
+ if (Cools.isEmpty(msg)) {
+ msg = jsonObject.getString("message");
+ }
+ r = R.error(Cools.isEmpty(msg) ? "涓嬪彂浠诲姟澶辫触" : msg);
}
} catch (IOException e) {
- throw new RuntimeException(e);
+ log.error("涓嬪彂浠诲姟缁檞cs寮傚父, request={}", JSON.toJSONString(params), e);
+ return R.error("璋冪敤WCS鎺ュ彛澶辫触锛�" + e.getMessage());
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽WCS涓嬪彂缁撴灉寮傚父, request={}, response={}", JSON.toJSONString(params), response, e);
+ return R.error("WCS杩斿洖缁撴灉寮傚父锛�" + e.getMessage());
}
return r;
}
-
-
/**
* 涓婃姤閿佸畾/閲婃斁搴撲綅淇℃伅
*
@@ -258,7 +283,7 @@
url = MesConstant.RELEASE_LOCS_URL;
}
}
- String response;
+ String response = null;
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
@@ -316,10 +341,25 @@
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("zpallet", mast.getBarcode())
.eq("loc_no", mast.getSourceLocNo()));
- if (Objects.isNull(locDetl)) {
+ WrkDetl mainWrkDetl = null;
+ if (Objects.isNull(locDetl) && !Cools.isEmpty(mast.getWrkCode())) {
+ mainWrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", mast.getWrkCode())
+ .eq("zpallet", mast.getBarcode()));
+ if (Objects.isNull(mainWrkDetl)) {
+ mainWrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", mast.getWrkCode()));
+ }
+ if (!Objects.isNull(mainWrkDetl)) {
+ log.info("locDetl涓虹┖锛屽洖閫�鏌ヨ涓讳换鍔℃槑缁嗭紝wrkNo={}, mainWrkNo={}, barcode={}",
+ mast.getWrkNo(), mast.getWrkCode(), mast.getBarcode());
+ }
+ }
+ if (Objects.isNull(locDetl) && Objects.isNull(mainWrkDetl)) {
throw new CoolException("鏄庣粏鏁版嵁涓嶅瓨鍦紒锛�");
}
- Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", locDetl.getMatnr()));
+ String matnrNo = Objects.isNull(locDetl) ? mainWrkDetl.getMatnr() : locDetl.getMatnr();
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnrNo));
if (Objects.isNull(matnr)) {
throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
}
@@ -327,9 +367,15 @@
Double val = Math.round((weight - matnr.getSafeQty()) * 10000) / 10000.0;
if (val.compareTo(0.0) > 0) {
WrkDetl wrkDetl = new WrkDetl();
- BeanUtils.copyProperties(locDetl, wrkDetl);
+ if (Objects.isNull(locDetl)) {
+ BeanUtils.copyProperties(mainWrkDetl, wrkDetl);
+ wrkDetl.setStockQty(Cools.isEmpty(mainWrkDetl.getStockQty()) ? mainWrkDetl.getAnfme() : mainWrkDetl.getStockQty());
+ wrkDetl.setZpallet(mast.getBarcode());
+ } else {
+ BeanUtils.copyProperties(locDetl, wrkDetl);
+ wrkDetl.setStockQty(locDetl.getAnfme());
+ }
wrkDetl.setWrkNo(mast.getWrkNo());
- wrkDetl.setStockQty(locDetl.getAnfme());
wrkDetl.setIoTime(new Date());
wrkDetl.setWeight(weight);
wrkDetl.setIoTime(mast.getIoTime());
@@ -371,6 +417,17 @@
} else {
throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
}
+ }else{
+ String wrkNo = mast.getWrkCode();
+ WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(orgWrk)) {
+ throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
+ }
+ mast.setOveMk("Y");
+ orgWrk.setOveMk("Y");
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
}
}
} else {
@@ -384,7 +441,7 @@
}
Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
if (!Cools.isEmpty(weight)) {
- Double val = Math.round((weight - 2.35) * 10000) / 10000.0;
+ Double val = Math.round((weight - 2.5) * 10000) / 10000.0;
//绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
realQty = val * matnr.getVolume();
if (realQty<matnr.getSafeQty()){
@@ -508,4 +565,142 @@
}
return locAround;
}
+
+ @Override
+ public R syncDeviceStatusFromWcs() {
+ if (!Boolean.parseBoolean(String.valueOf(switchValue))) {
+ return R.ok("WCS寮�鍏冲叧闂�");
+ }
+ String response = null;
+ try {
+ response = requestDeviceStatusFromWcs();
+ JSONObject jsonObject = JSON.parseObject(response == null ? "{}" : response);
+ Integer code = jsonObject.getInteger("code");
+ if (!Objects.equals(code, 200)) {
+ String msg = jsonObject.getString("msg");
+ return R.error(Cools.isEmpty(msg) ? "鑾峰彇WCS璁惧鐘舵�佸け璐�" : msg);
+ }
+ JSONObject data = jsonObject.getJSONObject("data");
+ DeviceStatusVo deviceStatusVo = data == null
+ ? new DeviceStatusVo()
+ : JSON.parseObject(data.toJSONString(), DeviceStatusVo.class);
+
+ int stationCount = syncStationStatus(deviceStatusVo.getStationList());
+ int crnCount = syncCrnStatus(deviceStatusVo.getCrnList());
+
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("stationCount", stationCount);
+ result.put("crnCount", crnCount);
+ log.info("鍚屾WCS璁惧鐘舵�佹垚鍔�, stationCount={}, crnCount={}", stationCount, crnCount);
+ return R.ok("鍚屾鎴愬姛").add(result);
+ } catch (Exception e) {
+ log.error("鍚屾WCS璁惧鐘舵�佸紓甯�, response={}", response, e);
+ return R.error("鍚屾WCS璁惧鐘舵�佸け璐�: " + e.getMessage());
+ }
+ }
+
+ private String requestDeviceStatusFromWcs() throws IOException {
+ HttpHandler.Builder builder = new HttpHandler.Builder()
+ .setUri(wcs_address)
+ .setPath(getDeviceStatus)
+ .setTimeout(10, TimeUnit.SECONDS);
+ String method = Cools.isEmpty(deviceStatusMethod) ? "POST" : deviceStatusMethod.trim().toUpperCase(Locale.ROOT);
+ if ("POST".equals(method)) {
+ return builder.setJson("{}").build().doPost();
+ }
+ return builder.build().doGet();
+ }
+
+ private int syncStationStatus(List<StationProtocol> stationList) {
+ if (stationList == null || stationList.isEmpty()) {
+ return 0;
+ }
+ int count = 0;
+ Date now = new Date();
+ for (StationProtocol stationProtocol : stationList) {
+ if (stationProtocol == null || stationProtocol.getStationId() == null) {
+ continue;
+ }
+ BasDevp basDevp = basDevpService.selectById(stationProtocol.getStationId());
+ boolean isNew = Objects.isNull(basDevp);
+ if (isNew) {
+ basDevp = new BasDevp();
+ basDevp.setDevNo(stationProtocol.getStationId());
+ basDevp.setAppeUser(WCS_SYNC_USER);
+ basDevp.setAppeTime(now);
+ }
+ basDevp.setInEnable(toFlag(stationProtocol.isInEnable()));
+ basDevp.setOutEnable(toFlag(stationProtocol.isOutEnable()));
+ basDevp.setAutoing(toFlag(stationProtocol.isAutoing()));
+ basDevp.setLoading(toFlag(stationProtocol.isLoading()));
+ basDevp.setCanining(toFlag(stationProtocol.isEnableIn()));
+ basDevp.setCanouting(toFlag(!stationProtocol.isRunBlock()));
+ basDevp.setWrkNo(defaultZero(stationProtocol.getTaskNo()));
+ basDevp.setBarcode(normalizeText(stationProtocol.getBarcode()));
+ basDevp.setGrossWt(stationProtocol.getWeight() == null ? 0D : stationProtocol.getWeight());
+ basDevp.setModiUser(WCS_SYNC_USER);
+ basDevp.setModiTime(now);
+ if (isNew) {
+ if (!basDevpService.insert(basDevp)) {
+ throw new CoolException("鏂板绔欑偣鐘舵�佸け璐�, stationId=" + stationProtocol.getStationId());
+ }
+ } else if (!basDevpService.updateById(basDevp)) {
+ throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐�, stationId=" + stationProtocol.getStationId());
+ }
+ count++;
+ }
+ return count;
+ }
+
+ private int syncCrnStatus(List<CrnProtocol> crnList) {
+ if (crnList == null || crnList.isEmpty()) {
+ return 0;
+ }
+ int count = 0;
+ Date now = new Date();
+ for (CrnProtocol crnProtocol : crnList) {
+ if (crnProtocol == null || crnProtocol.getCrnNo() == null) {
+ continue;
+ }
+ BasCrnp basCrnp = basCrnpService.selectById(crnProtocol.getCrnNo());
+ boolean isNew = Objects.isNull(basCrnp);
+ if (isNew) {
+ basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(crnProtocol.getCrnNo());
+ basCrnp.setInEnable(YES);
+ basCrnp.setOutEnable(YES);
+ basCrnp.setAppeUser(WCS_SYNC_USER);
+ basCrnp.setAppeTime(now);
+ }
+ // crn_sts 鏈湴琛ㄥ瓨鐨勬槸鈥滃爢鍨涙満妯″紡(鎵嬪姩/鑷姩/鐢佃剳)鈥濓紝鍥犳蹇呴』鍐� mode锛屼笉鑳藉啓 status銆�
+ basCrnp.setCrnSts(defaultZero(crnProtocol.getMode()));
+ basCrnp.setWrkNo(defaultZero(crnProtocol.getTaskNo()));
+ basCrnp.setCrnErr(crnProtocol.getAlarm() == null ? 0L : Long.valueOf(crnProtocol.getAlarm()));
+ basCrnp.setModiUser(WCS_SYNC_USER);
+ basCrnp.setModiTime(now);
+ if (isNew) {
+ if (!basCrnpService.insert(basCrnp)) {
+ throw new CoolException("鏂板鍫嗗灈鏈虹姸鎬佸け璐�, crnNo=" + crnProtocol.getCrnNo());
+ }
+ } else if (!basCrnpService.updateById(basCrnp)) {
+ throw new CoolException("鏇存柊鍫嗗灈鏈虹姸鎬佸け璐�, crnNo=" + crnProtocol.getCrnNo());
+ }
+ count++;
+ }
+ return count;
+ }
+
+ private Integer defaultZero(Integer value) {
+ return value == null ? 0 : value;
+ }
+
+ private String normalizeText(String value) {
+ return Cools.isEmpty(value) ? "" : value;
+ }
+
+ private String toFlag(boolean value) {
+ return value ? YES : NO;
+ }
}
+
+
--
Gitblit v1.9.1