From aede5c5c19740a9903dfe2873caaacc10eebda66 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 12:37:07 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 94 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 1336d66..15a4fc0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,16 +1,56 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.core.common.R;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WmsLocStatus;
+import com.zy.asrs.entity.param.TaskOverToWms;
+import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
import java.util.List;
-
+import java.util.Map;
+@Slf4j
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Autowired
+ private ApiLogService apiLogService;
+
+ @Override
+ public List<LocMast> selectLocMastListSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1,Integer curr,Integer limit) {
+ return this.baseMapper.selectLocMastListSix(locNo,whsType,crnNo,row1,bay1,lev1,curr,limit);
+ }
+
+ @Override
+ public Long selectLocMastListTotalSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1) {
+ return this.baseMapper.selectLocMastListTotalSix(locNo,whsType,crnNo,row1,bay1,lev1);
+ }
+
+ @Override
+ public List<LocMast> selectLocMastList(String locNo,Integer curr,Integer limit) {
+ return this.baseMapper.selectLocMastList(locNo,curr,limit);
+ }
+
+ @Override
+ public Long selectLocMastListTotal(String locNo) {
+ return this.baseMapper.selectLocMastListTotal(locNo);
+ }
+
@Override
public List<Integer> queryDistinctRow(Integer crnNo) {
@@ -54,11 +94,61 @@
@Override
public LocMast selectByLocNo(String locNo) {
- return this.baseMapper.selectByLocNo(locNo);
+ return this.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo));
+
+ //return this.baseMapper.selectByLocNo(locNo);
}
@Override
public List<LocMast> selectLocByLev(Integer lev) {
return this.baseMapper.selectLocByLev(lev);
}
+
+ @Override
+ public R toWmsLocStatus(LocMast locMast) {
+ String response = null;
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ WmsLocStatus param = new WmsLocStatus();
+ param.setWarehouseId("1688469798893297665");
+ param.setLocationCode(Utils.getWmsLocNo(locMast.getLocNo()));
+ param.setEmptyContainer(locMast.getEmptyContainer$());
+ if (locMast.getLocSts().equals("Z")){
+ param.setStatus("JY");
+ }else {
+ param.setStatus("QY");
+ }
+ if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("O")){
+ param.setContainerCode("");
+ param.setContainerTypeCode("");
+ }else {
+ param.setContainerCode(locMast.getBarcode());
+ param.setContainerTypeCode(locMast.getContainerTypeCode());
+ }
+
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/locationUpdate")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+ }
+ JSONObject jsonObject = JSON.parseObject(response);
+
+
+ apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
+ ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(param)
+ ,response
+ ,true
+ );
+
+ return null;
+ }
}
--
Gitblit v1.9.1