Browse Source

新增倒库卸货

liyg 2 years ago
parent
commit
475d536712

+ 5 - 0
src/main/java/com/steerinfo/dil/controller/WmsInboundScanResultController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.steerinfo.dil.feign.BmsTruckFeign;
 import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.OmsFeign;
+import com.steerinfo.dil.feign.TmstruckFeign;
 import com.steerinfo.dil.mapper.WmspInboundResultMapper;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.impl.RmsMaterialServiceImpl;
@@ -65,6 +66,8 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
     @Autowired
     BmsTruckFeign bmsTruckFeign;
 
+    @Autowired
+    TmstruckFeign tmstruckFeign;
 
     /**
      * 1.新增扫描吊牌实绩!!!此时入库实绩未生成
@@ -101,6 +104,8 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
             }
             //返回新建的扫码实绩数据
             List<Map<String,Object>> mapList= wmsInboundScanResultService.noIssueScanResultList(map.get("userName").toString());
+            //新增卸货实绩
+            tmstruckFeign.updateUnloadResult(order);
             //关闭运输订单
             omsFeign.closeSteelOrderType4(DataChange.dataToBigDecimal(orderId));
             //生成计费详单

+ 4 - 1
src/main/resources/com/steerinfo/dil/mapper/WmspInboundScanResultMapper.xml

@@ -1092,7 +1092,10 @@ where wisr.result_id = #{stackResultId}
         where wisr.result_material=#{resultMaterial} and (wgm.DELETED is null or wgm.DELETED='0')
     </select>
     <select id="getOrderTypeByNum" resultType="java.util.Map">
-        select ORDER_TYPE "orderType",ORDER_ID "orderId" from OMSTRUCK_ORDER
+        select ORDER_TYPE "orderType",
+               ORDER_ID "orderId",
+               ORDER_NUMBER "orderNumber"
+               from OMSTRUCK_ORDER
         where ORDER_NUMBER=SUBSTR(#{orderNumber}, 0, 21)
     </select>
     <select id="findInboundScanResult" resultType="java.util.Map">