修改供应商以及打开火运装车港存库出库

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "dil-wsm-api",url = "${openfeign.WmsBoundFeign.url}")
+@FeignClient(value = "dil-wsm-api",url = "${openfeign.WmshBoundFeign.url}")
 public interface WmshBoundFeign {
 
     @PostMapping("api/v1/wmsh/wmshinboundresults/addWarehousingResult")

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

@@ -141,19 +141,18 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //修改运力状态为执行中 1
 //        int i2 = utilsService.updateCapacityStatus(map, 1);
 
-//        //新增港存库出库实绩 并修改实时库存
-//        BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
-//        if(portId != null){
-//            BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-//            if(batchId != null){
-//                Map<String, Object> hashMap = new HashMap<>();
-//                hashMap.put("batchId", batchId);
-//                hashMap.put("portId", portId);
-//                hashMap.put("resultTonnage",resultMeasuredTonnage);
-//                hashMap.put("isClean", resultIsclear);
-//                wmshBoundFeign.addResult(hashMap);
-//            }
-//        }
+        Object portId = map.get("portId");
+        if(portId != null){
+            BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+            if(batchId != null){
+                Map<String, Object> hashMap = new HashMap<>();
+                hashMap.put("batchId", batchId);
+                hashMap.put("portId", portId);
+                hashMap.put("resultTonnage",resultMeasuredTonnage);
+                hashMap.put("isClean", resultIsclear);
+                wmshBoundFeign.addResult(hashMap);
+            }
+        }
         return i + i1;
     }
 

src/main/resources/bootstrap.yml

@@ -21,8 +21,8 @@ openfeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:localhost:8076}
-  WmsBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
+  WmshBoundFeign:
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.161:8070}
   WMSFeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
   OmsFeign:

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

@@ -11,6 +11,8 @@
     from DIL_BATCH DB
              left join RMS_MATERIAL RM
                        on RM.MATERIAL_ID = DB.MATERIAL_ID
+    where DB.RESULT_FOREIGN_SHIP_NAME is not NULL
+    order by DB.BATCH_ID desc
 </select>
 
 

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

@@ -453,7 +453,7 @@
         RG.GATEPOST_NAME "gatepostName",
         TER.RESULT_ENTRY_MODE "resultEntryMode",
         TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
-        RS.SUPPLIER_DUTY_PARAGRAPH "supplierName",
+        RS.SUPPLIER_NAME "supplierName",
         OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
         TER.INSERT_TIME "insertTime",
         RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName"

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

@@ -607,7 +607,7 @@
         TLR.INSERT_UPDATE_REMARK "insertUpdateRemark",
         TLR.INSERT_TIME "insertTime",
         RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-        RS.SUPPLIER_DUTY_PARAGRAPH "supplierName"
+        RS.SUPPLIER_NAME "supplierName"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -895,7 +895,7 @@
         TLR.INSERT_UPDATE_REMARK "insertUpdateRemark",
         TLR.INSERT_TIME "insertTime",
         RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-        RS.SUPPLIER_DUTY_PARAGRAPH "supplierName"
+        RS.SUPPLIER_NAME "supplierName"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID

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

@@ -311,7 +311,7 @@
         TMC.COMMSSION_ID "commssionId",
         <if test="orderTypee = 3">
             APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-            RS3.SUPPLIER_DUTY_PARAGRAPH "supplierName",
+            RS3.SUPPLIER_NAME "supplierName",
         </if>
         <if test="orderTypee = 1">
             ASO.SALE_NUMBER "saleNumber",

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

@@ -599,7 +599,7 @@
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        RS.SUPPLIER_DUTY_PARAGRAPH "supplierName",
+        RS.SUPPLIER_NAME "supplierName",
         RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR