wms 修改

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

@@ -129,7 +129,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
      * 返回值：
      *   list：出库单实绩
      * */
-    @PostMapping(value = "/insertWmspOutBoundResult8")
+    @PostMapping(value = "/insertWmspOutBoundResult")
     public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval){
         /**拿到前端传递的运输订单号*/
         String orderNumber = mapval.get("orderNumber").toString();

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

@@ -418,7 +418,7 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="selectGridMaterial" resultType="java.util.Map" parameterType="java.math.BigDecimal">
-    select *
+    select distinct *
     from (select
     RW.WAREHOUSE_NAME "warehouseName",
     RS.STACKING_NO "stackingNo",
@@ -445,7 +445,7 @@
     left join RMS_MATERIAL_TYPE RMT
     on RM.MATERIAL_TYPE_ID=RMT.MATERIAL_TYPE_ID
     left join WMSP_INBOUND_RESULT WIR
-    on WIR.GRID_ID = WGM.GRID_ID
+    on WIR.MATERIAL_ID = WGM.MATERIAL_ID
     where WGM.DELETED = 0 and WIR.INBOUND_ISCOMPLETE = 1 order by WGM.INSERT_TIME DESC
     )
    <if test="con!=null">

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

@@ -1332,7 +1332,7 @@
               select inbound_id from WMSP_INBOUND_RESULT wir
               left join rms_material_steel rms
               on wir.material_id = rms.material_steel_id
-              where rms.material_id=(select distinct material_id from rms_material_steel where material_steel_id =#{materialId} ) and INBOUND_ISCOMPLETE='1' and Rownum='1'
+              where rms.material_id=(select distinct material_id from rms_material_steel where material_steel_id =#{materialId} ) and INBOUND_ISCOMPLETE='1' and Rownum='1' and rms.UPDATE_TIME is null
               order by wir.insert_time desc
           )
         )