修改港口出库

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

@@ -129,6 +129,40 @@ public class WmshGridMaterialController extends BaseRESTfulController {
 
 
 
+    /**
+     * 展示万州港港存库库存列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示港存库出库", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "494", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getUnLockPortStock")
+    public RESTfulResult getUnLockPortStock(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId,
+                                                        String con){
+        if (con!=null&&!"".equals(con)){
+            mapVal.put("con",con);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = wmshGridMaterialService.getUnLockPortStock(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        return success(data);
+    }
+
+
+
+
+
 
     //清场
     @ApiModelProperty(value = "清场远程调用")

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

@@ -46,4 +46,6 @@ public interface WmshGridMaterialMapper extends IBaseMapper<WmshGridMaterial, Bi
    List<Map<String,Object>> getGridId(Map<String,Object> map);
 
     List<Map<String, Object>> getLoadPortStockByMaterialName(Map<String, Object> mapVal);
+
+    List<Map<String, Object>> getUnLockPortStock(Map<String, Object> mapVal);
 }

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

@@ -42,4 +42,6 @@ public interface IWmshGridMaterialService {
     int clearWmshGridMaterial(Map<String, Object> map);
 
     List<Map<String, Object>> getLoadPortStockByMaterialName(Map<String, Object> mapVal);
+
+    List<Map<String, Object>> getUnLockPortStock(Map<String, Object> mapVal);
 }

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

@@ -138,4 +138,10 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
         return wmshGridMaterialMapper.getLoadPortStockByMaterialName(mapVal);
     }
 
+    //展示出库总吨位
+    @Override
+    public List<Map<String, Object>> getUnLockPortStock(Map<String, Object> mapVal) {
+        return wmshGridMaterialMapper.getUnLockPortStock(mapVal);
+    }
+
 }

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

@@ -468,4 +468,32 @@
         GROUP BY
             rm.MATERIAL_NAME
     </select>
+
+
+    <select id="getUnLockPortStock" resultType="java.util.Map" parameterType="java.util.Map">
+        select WOR.RESULT_ID               "resultId",
+               TLT.RESULT_WAGON_NO        "wagon",
+               TLT.PURCHASE_ORDER_NO      "purchaseOrderNo",
+               WOR.RESULT_NUMBER           "resultNumber",
+               RP.PORT_NAME                "portName",
+               RM.MATERIAL_NAME            "materialName",
+               DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+               WOR.RESULT_TONNAGE          "resultTonnage",
+               WOR.RESULT_CLEARING         "resultClearing",
+               WOR.INSERT_TIME             "insertTime"
+        from TMSTRAIN_LOADING_TEMP TLT
+                 left join AMS_PURCHASE_ORDER APO
+                           on TLT.PURCHASE_ORDER_NO = APO.PURCHASE_ORDER_NO
+                 left join DIL_BATCH DB
+                           on DB.BATCH_ID = APO.BATCH_ID
+                 left join WMSH_OUTBOUND_RESULT WOR
+                           on DB.BATCH_ID = WOR.BATCH_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = DB.MATERIAL_ID
+                 left join RMS_PORT RP
+                           on RP.PORT_ID = WOR.HARBOR_ID
+        where  (instr(RM.MATERIAL_NAME , #{con}) > 0 or instr( TLT.RESULT_WAGON_NO, #{con}) > 0 or
+                instr(DB.RESULT_FOREIGN_SHIP_NAME,#{con}) > 0 or instr( RP.PORT_NAME,#{con}) > 0)
+        Order By  WOR.RESULT_NUMBER desc
+    </select>
 </mapper>