From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001 From: ynhfasrs <ynhfasrs@qq.com> Date: 星期五, 27 六月 2025 14:23:37 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 55 ++++--------------------------------------------------- 1 files changed, 4 insertions(+), 51 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 6265873..8b10ed7 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -2,13 +2,12 @@ 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; @@ -72,59 +71,13 @@ @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