src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -663,6 +663,18 @@ public class UniversalController extends BaseRESTfulController {
        return success(carrier);
     }
 
+
+    @ApiOperation(value = "质保书前端展示")
+    @PostMapping("/getWarranty")
+    public RESTfulResult getWarranty(@RequestParam("orderNumber") String orderNumber) {
+
+        //List<String> list = universalService.getWarrantyAndPrint(orderNumber);
+        List<String> list= universalService.getWarranty(orderNumber);
+        if(list.get(0).equals("0")){
+            return failed("质保书正在紧张制作中，请耐心等待！");
+        }
+        return success(list);
+    }
     @ApiOperation(value = "查询待分解计划数量")
     @PostMapping("/getPlanCount")
     public Integer getPlanCount(){
@@ -673,5 +685,16 @@ public class UniversalController extends BaseRESTfulController {
     @GetMapping("/getTransRange")
     public RESTfulResult getTransRange(){
         return success(universalMapper.getTransRange());
+
     }
+
+//    //测试质保书回显
+//    @PostMapping("/getTest")
+//    public RESTfulResult getTest(@RequestBody Map<String,Object> map){
+//       List<String> list = universalService.getTest(map);
+//       if(list.get(0).equals("0")){
+//           return failed("质保书正在紧张制作中，请耐心等待！");
+//       }
+//       return success(list);
+//    }
 }

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -19,4 +19,7 @@ public interface JoinFeign {
     @PostMapping("api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult")
     Map<String, Object> receiveTmsTruckWeightResult(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("api/v1/join/wmsoutboundresult/sendWarranty")
+    String sendWarranty(@RequestBody Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -139,6 +139,8 @@ public interface UniversalMapper {
 
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 
+    List<Map<String,Object>> getWarranty(String orderNumber);
+
     List<Map<String, Object>> getCapacityType(Map<String, Object> mapValue);
 
     Integer getPlanCount();
@@ -146,4 +148,9 @@ public interface UniversalMapper {
     List<Map<String, Object>> getTransRange();
 
 
+    BigDecimal getResultMaterialId(String orderNumber);
+
+    Map<String, Object> selectNum(String orderNumber);
+
+    List<Map<String, Object>> selectOutbound(String orderNumber);
 }

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -15,4 +15,10 @@ public interface UniversalService {
 
     //查询路段顺序及当前路段顺序号
     Map<String, Object> getNowLineMes(Map<String, Object> map);
+
+    List<String> getWarrantyAndPrint(String orderNumber);
+
+    List<String> getWarranty(java.lang.String orderNumber);
+
+    List<String> getTest(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -1,14 +1,19 @@
 package com.steerinfo.dil.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.UniversalService;
+import com.steerinfo.dil.util.ESUtil;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.InputStream;
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.sql.Blob;
+import java.sql.SQLException;
+import java.util.*;
 
 /**
  * @ author    :TXF
@@ -20,6 +25,12 @@ public class UniversalServiceImpl implements UniversalService {
 
     @Resource
     private UniversalMapper universalMapper;
+
+    @Autowired
+    private JoinFeign joinFeign;
+
+    @Autowired
+    private ESUtil esUtil;
     /**
      * 打印提货单
      * @param orderNumber 运输订单号
@@ -48,6 +59,86 @@ public class UniversalServiceImpl implements UniversalService {
         return null;
     }
 
+    @Override
+    public  List<String> getWarrantyAndPrint(String orderNumber) {
+        List<Map<String,Object>> warrantyCode = universalMapper.getWarranty(orderNumber);
+        List<String> list = new ArrayList<>();
+        String content = null;
+        for(Map<String,Object> code:warrantyCode){
+            Blob blob = (Blob) code.get("warrantyCode");
+            try {
+               content = new String(blob.getBytes((long)1, (int)blob.length()));
+               String string = content.substring(0,content.length()-2);
+               System.out.println(string);
+               list.add(string);
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+            }
+        }
+
+        return list;
+    }
+
+    @Override
+    public List<String> getWarranty(String orderNumber) {
+        //回传金蝶
+        //根据orderNumber查询
+        Map<String,Object> map = getWarrantyToES(orderNumber);
+        String string = joinFeign.sendWarranty(map);
+        Map<String,Object> waMap = JSON.parseObject(string);
+        List<String> list = new ArrayList<>();
+        //成功
+        if(waMap.get("kdStatus").equals("1")){
+            List<Map<String,Object>> reportList = (List<Map<String,Object>>) waMap.get("qcReportList");
+            Map<String,Object> map1 = reportList.get(0);
+            Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
+            Map.Entry<String,Object> entry;
+            while(it.hasNext()){
+                entry =  it.next();
+                String value = (String) entry.getValue();
+                list.add(value);
+            }
+        }//失败
+        else{
+            list.add("0");
+        }
+        return list;
+    }
+
+    @Override
+    public List<String> getTest(Map<String, Object> map) {
+        List<String> list = new ArrayList<>();
+        //成功
+        if(map.get("kdStatus").equals("1")){
+            List<Map<String,Object>> reportList = (List<Map<String,Object>>) map.get("qcReportList");
+            Map<String,Object> map1 = reportList.get(0);
+            Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
+            Map.Entry<String,Object> entry;
+            while(it.hasNext()){
+                entry =  it.next();
+                String value = (String) entry.getValue();
+                list.add(value);
+            }
+        }//失败
+        else{
+            list.add("0");
+        }
+        return list;
+    }
+
+    //出库与金蝶打通接口(获得质保书)
+    public Map<String,Object> getWarrantyToES(String orderNumber) {
+        Map<String, Object> input = new HashMap<>();
+        Map<String, Object> head = universalMapper.selectNum(orderNumber);
+        input.put("head", head);
+        List<Map<String, Object>> mapList = universalMapper.selectOutbound(orderNumber);
+        input.put("entries",mapList);
+        Map<String,Object> totalMap = esUtil.getTotalMap();
+        //组装报文
+        totalMap.put("input",input);
+        return totalMap;
+    }
+
 
     /**
      * sha1加密字符串

src/main/java/com/steerinfo/dil/util/ESUtil.java

@@ -0,0 +1,66 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class ESUtil {
+
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "A004";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "dgQcReportHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/resources/application-dev.yml

@@ -10,19 +10,19 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
     url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -160,7 +160,7 @@
                      ON RCC.CAPACITY_ID = RC.CAPACITY_ID
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RCC.CARRIER_ID
-                 WHERE  RC.CAPACITY_SSO_ID is not NULL
+                 WHERE RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
@@ -757,6 +757,15 @@
 
 
     </select>
+
+
+    <select id="getWarranty" resultType="java.util.Map" parameterType="java.lang.String">
+        select oom.WARRANTY_CODE "warrantyCode"
+        from OMSTRUCK_ORDER oo
+        left join OMSTRUCK_ORDER_MATERIAL oom
+        on oom.ORDER_ID = oo.ORDER_ID
+        where oo.ORDER_NUMBER = #{orderNumber}
+    </select>
     <select id="getPlanCount" resultType="java.lang.Integer">
         SELECT
             COUNT( * )
@@ -775,4 +784,40 @@
         FROM
         RMS_TRANS_RANGE RTR
     </select>
+
+    <select id="getResultMaterialId" resultType="DECIMAL" parameterType="DECIMAL">
+    select worm.RESULT_MATERIAL_ID from WMSP_OUTBOUND_RESULT_MATERIAL worm
+    where worm.OUTBOUND_RESULT_ID = #{resultId} and worm.STATUS=2
+  </select>
+
+    <select id="selectOutbound" parameterType="java.lang.String" resultType="java.util.Map">
+            select distinct
+            substr(rm.MATERIAL_SPECIFICATION,2) "size",
+            rm.MATERIAL_MODEL "brand",
+            rms.MATERIAL_FURNACE_NUMBER "heatNum"
+            from OMSTRUCK_ORDER oo
+            left join WMSP_OUTBOUND_RESULT wor
+            on wor.BILL_LADING_ID = oo.ORDER_ID
+            left join WMSP_OUTBOUND_RESULT_MATERIAL worm
+            on worm.OUTBOUND_RESULT_ID = wor.RESULT_ID
+            left join RMS_MATERIAL rm
+            on rm.MATERIAL_ID = worm.MATERIAL_ID
+            left join WMSP_OUTBOUND_SCAN_RESULT wosr
+            on wosr.RESULT_MATERIAL_ID = worm.RESULT_MATERIAL_ID
+            left join WMSP_INBOUND_SCAN_RESULT wisr
+            on wisr.RESULT_MATERIAL = wosr.RESULT_MATERIAL
+            left join RMS_MATERIAL_STEEL rms
+            on rms.MATERIAL_STEEL_ID = wisr.MATERIAL_ID
+        where oo.ORDER_NUMBER= #{orderNumber}
+    </select>
+
+    <select id="selectNum" parameterType="java.lang.String" resultType="java.util.Map">
+        select distinct
+        rc.CAPACITY_NUMBER "carNum",
+        oo.ORDER_NUMBER "driveNo"
+        from OMSTRUCK_ORDER oo
+        left join RMS_CAPACITY rc
+        on rc.CAPACITY_ID = oo.CAPACITY_ID
+        where oo.ORDER_NUMBER= #{ORDER_NUMBER}
+    </select>
 </mapper>