2022年11月14日08:31:28

ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/ForeignApiController.java

@@ -0,0 +1,48 @@
+package com.ruoyi.web.controller.plugin;
+
+import com.ruoyi.ccb.domain.QueryLowerPositionR;
+import com.ruoyi.ccb.service.ForeignHttpService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * WMS接⼝
+ *
+ * @author s
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/open/wms")
+public class ForeignApiController {
+
+    @Autowired
+    private ForeignHttpService foreignHttpService;
+
+
+    /**
+     * 查询下级位置接⼝
+     *
+     * @return 结果
+     */
+    @PostMapping("/queryLowerPositionV1")
+    public QueryLowerPositionR queryLowerPositionV1(@RequestParam(value = "position", required = false) String position) {
+        return foreignHttpService.queryLowerPositionV1(position);
+    }
+
+    /**
+     * 根据位置code查询位置信息接⼝
+     *
+     * @return 结果
+     */
+    @PostMapping("/queryPositionV1")
+    public Map<String, Object> queryPositionV1(@RequestParam(value = "position") String position) {
+        return foreignHttpService.queryPositionV1(position);
+    }
+
+}

ruoyi-plugin/src/main/java/com/ruoyi/ccb/domain/QueryLowerPositionR.java

@@ -0,0 +1,31 @@
+package com.ruoyi.ccb.domain;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 凭证号返回报文
+ *
+ * @author s
+ */
+@Data
+public class QueryLowerPositionR {
+
+    /**
+     * 状态码
+     */
+    private String code;
+
+    /**
+     * 描述
+     */
+    private String msg;
+
+    /**
+     * 数据集合
+     */
+    private List<Map<String,Object>> data;
+
+}

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/ForeignHttpService.java

@@ -0,0 +1,23 @@
+package com.ruoyi.ccb.service;
+
+import com.ruoyi.ccb.domain.*;
+import com.ruoyi.ccb.domain.basic.Page;
+
+import java.util.Map;
+
+/**
+ * CCB-HTTP接口
+ *
+ * @author s
+ */
+public interface ForeignHttpService {
+
+    /**
+     * 查询保管凭证号
+     *
+     * @return 结果
+     */
+    QueryLowerPositionR queryLowerPositionV1(String position);
+
+    Map<String, Object> queryPositionV1(String position);
+}

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/impl/ForeignHttpServiceImpl.java

@@ -0,0 +1,89 @@
+package com.ruoyi.ccb.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.basicData.domain.TWarehouseWebcam;
+import com.ruoyi.basicData.service.ITWarehouseService;
+import com.ruoyi.ccb.domain.*;
+import com.ruoyi.ccb.domain.basic.CargoDetail;
+import com.ruoyi.ccb.domain.basic.CargoLockInfo;
+import com.ruoyi.ccb.domain.basic.Page;
+import com.ruoyi.ccb.domain.basic.SyncedOrg;
+import com.ruoyi.ccb.service.CcbHttpService;
+import com.ruoyi.ccb.service.ForeignHttpService;
+import com.ruoyi.common.constant.LiveBroadcast;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.JsonUtil;
+import com.ruoyi.reportManagement.domain.TWhgenleg;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
+import com.ruoyi.warehouseBusiness.service.IWarehouseBillsCcbService;
+import lombok.AllArgsConstructor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * CCB-HTTP接口实现
+ *
+ * @author s
+ */
+@Service
+@AllArgsConstructor
+public class ForeignHttpServiceImpl implements ForeignHttpService {
+
+    @Autowired
+    private ITWarehouseService itWarehouseService;
+
+    @Override
+    public QueryLowerPositionR queryLowerPositionV1(String position) {
+        List<Map<String,Object>> mapList = new ArrayList<>();
+        TWarehouse tWarehouse = new TWarehouse();
+        tWarehouse.setDelFlag("0");
+        tWarehouse.setfStatus("0");
+        if (ObjectUtil.isNotNull(position)){
+            tWarehouse.setfNo(position);
+        }else{
+            tWarehouse.setParentId(100l);
+        }
+        List<TWarehouse> list = itWarehouseService.selectTWarehouseList(tWarehouse);
+        for (TWarehouse tWarehouse_:list) {
+            Map<String,Object> map = new HashMap<>();
+            map.put("code",tWarehouse_.getfNo());
+            map.put("name",tWarehouse_.getfName());
+            mapList.add(map);
+        }
+        QueryLowerPositionR queryLowerPositionR = new QueryLowerPositionR();
+        queryLowerPositionR.setCode("0");
+        queryLowerPositionR.setMsg("成功");
+        queryLowerPositionR.setData(mapList);
+        return queryLowerPositionR;
+    }
+
+    @Override
+    public Map<String, Object> queryPositionV1(String position) {
+        Map<String,Object> map = new HashMap<>();
+        TWarehouse tWarehouse = itWarehouseService.selectByCode(position);
+        if (ObjectUtil.isNotNull(tWarehouse)){
+            map.put("code",tWarehouse.getfNo());
+            map.put("name",tWarehouse.getfName());
+        }
+        Map<String,Object> mapR = new HashMap<>();
+        mapR.put("code","0");
+        mapR.put("msg","成功");
+        mapR.put("data",map);
+        return mapR;
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITWarehouseService.java

@@ -186,4 +186,6 @@ public interface ITWarehouseService {
      * @return
      */
     List<TWarehouse> lazyList(TWarehouse tWarehouse);
+
+    TWarehouse selectByCode(String position);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -462,6 +462,11 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
     }
 
     @Override
+    public TWarehouse selectByCode(String position) {
+        return tWarehouseMapper.getWarehouseByNo(position);
+    }
+
+    @Override
     public String checkUFNoUnique(TWarehouse tWarehouse) {
         TWarehouse tWarehouse1 = tWarehouseMapper.checkFNoUnique(tWarehouse.getfNo());
         if (StringUtils.isNotNull(tWarehouse1) && tWarehouse1.getfId() != tWarehouse.getfId()) {

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -352,7 +352,7 @@
     <select id="getWarehouseByNo" parameterType="String" resultMap="TWarehouseResult">
         <include refid="selectTWarehouseVo"/>
         <where>
-            f_no = #{fNo} limit 1
+            f_no = #{fNo} and del_flag = '0' limit 1
         </where>
     </select>
 </mapper>