tijiao

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

@@ -85,17 +85,10 @@ public class WmspOutboundResultController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer apiId,
-                                               String con,
+                                               Integer warehouseId,
                                                String startTime,
-                                               String endTime)
-    {
-
-        if (mapval.containsKey("starTime")&&mapval.get("starTime")!=null){
-            startTime=mapval.get("starTime").toString();
-        }
-        if (mapval.containsKey("endTime")&&mapval.get("endTime")!=null){
-            endTime=mapval.get("endTime").toString();
-        }
+                                               String endTime){
+        mapval.put("warehouseId",warehouseId);
         DataChange.queryDataByDateTime(startTime,endTime,mapval,simpleDateFormat);
         List<Map<String, Object>> libaryOutBoundList  = wmspOutboundResultService.selectResultNumber(mapval);
         PageHelper.startPage(pageNum, pageSize);

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -619,18 +619,37 @@
     END MATERIAL_QUALIFIED,
     ckd.INSERT_UPDATE_REMARK "insertUpdateRemark"
     FROM WMSP_OUTBOUND_RESULT ckd
-    LEFT JOIN OMSTRUCK_ORDER ysdd ON ckd.BILL_LADING_ID = ysdd.ORDER_ID
-    LEFT JOIN RMS_CAPACITY ylxx ON ysdd.CAPACITY_ID = ylxx.CAPACITY_ID
-    LEFT JOIN OMSTRUCK_ORDER_MATERIAL yswz ON ysdd.ORDER_ID = yswz.ORDER_ID
-    LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT wosr ON wosr.OUTBOUND_RESULT_ID = ckd.RESULT_ID
-    LEFT JOIN WMSP_INBOUND_SCAN_RESULT sisr ON wosr.INBOUND_RESULT_ID = sisr.INBOUND_RESULT_ID
-    LEFT JOIN WMSP_GRID_MATERIAL wzwg ON sisr.MATERIAL_ID = wzwg.MATERIAL_ID
-    LEFT JOIN RMS_PWAREHOUSE_GRID wg ON wzwg.GRID_ID = wg.GRID_ID
-    LEFT JOIN RMS_WAREHOUSE ck ON wg.WAREHOUSE_ID = ck.WAREHOUSE_ID
-    LEFT JOIN RMS_STACKING dw ON wg.STACKING_ID = dw.STACKING_ID
-    LEFT JOIN RMS_MATERIAL_STEEL gcwz ON wzwg.MATERIAL_ID = gcwz.MATERIAL_STEEL_ID
-    LEFT JOIN RMS_MATERIAL wz ON gcwz.MATERIAL_ID = wz.MATERIAL_ID
-    LEFT JOIN RMS_UNIT_OF_MEASURE jldw ON wz.UNIT_OF_MEASURE_ID = jldw.UNIT_OF_MEASURE_ID
+    LEFT JOIN OMSTRUCK_ORDER ysdd
+        ON ckd.BILL_LADING_ID = ysdd.ORDER_ID
+    LEFT JOIN RMS_CAPACITY ylxx
+        ON ysdd.CAPACITY_ID = ylxx.CAPACITY_ID
+    LEFT JOIN OMSTRUCK_ORDER_MATERIAL yswz
+        ON ysdd.ORDER_ID = yswz.ORDER_ID
+    LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT wosr
+        ON wosr.OUTBOUND_RESULT_ID = ckd.RESULT_ID
+    LEFT JOIN WMSP_INBOUND_SCAN_RESULT sisr
+        ON wosr.INBOUND_RESULT_ID = sisr.INBOUND_RESULT_ID
+    LEFT JOIN WMSP_GRID_MATERIAL wzwg
+        ON sisr.MATERIAL_ID = wzwg.MATERIAL_ID
+    LEFT JOIN RMS_PWAREHOUSE_GRID wg
+        ON wzwg.GRID_ID = wg.GRID_ID
+    LEFT JOIN RMS_WAREHOUSE ck
+        ON wg.WAREHOUSE_ID = ck.WAREHOUSE_ID
+    LEFT JOIN RMS_STACKING dw
+        ON wg.STACKING_ID = dw.STACKING_ID
+    LEFT JOIN RMS_MATERIAL_STEEL gcwz
+        ON wzwg.MATERIAL_ID = gcwz.MATERIAL_STEEL_ID
+    LEFT JOIN RMS_MATERIAL wz
+        ON gcwz.MATERIAL_ID = wz.MATERIAL_ID
+    LEFT JOIN RMS_UNIT_OF_MEASURE jldw
+        ON wz.UNIT_OF_MEASURE_ID = jldw.UNIT_OF_MEASURE_ID
+               WHERE  wg.WAREHOUSE_ID = #{warehouseId}
+    <if test="startTime != null and endTime !=null">
+      and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and  to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
+    </if>
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ckd.insert_time
+    </if>
     <where>
       <if test="resultNumber != null">
         and
@@ -734,12 +753,6 @@
           "resultOutboundType" like '%${item}%'
         </foreach>
       </if>
-      <if test="startTime != null and endTime !=null">
-        and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and  to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
-      </if>
-      <if test="oneDate != null">
-        and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ckd.insert_time
-      </if>
     </where>
    
   </select>

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

@@ -626,6 +626,7 @@
     left join RMS_WAREHOUSE t8
     on RPG.WAREHOUSE_ID=t8.WAREHOUSE_ID
      where WGM.DELETED=0 and WGM.STATUS!=1
+       and RPG.WAREHOUSE_ID != 3
     <if test="warehouseid != null">
       and t8.WAREHOUSE_ID = #{warehouseid,jdbcType=DECIMAL}
     </if>