tijiao

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

@@ -63,16 +63,17 @@ public class WmspGridMaterialController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 Integer apiId,
-                                                Integer warehouseId,
+                                                String warehouseId,
+                                                String time,
                                                 String con) {
 
 
         if (con!=null&&!con.equals("undefined")) {
             mapVal.put("con", "%" + con + "%");
         }
-        List<Map<String, Object>>   libaryInBoundList = wmspGridMaterialService.selectGridMaterial(mapVal,warehouseId);
+        List<Map<String, Object>>   libaryInBoundList = wmspGridMaterialService.selectGridMaterial(mapVal,warehouseId,time);
         PageHelper.startPage(pageNum, pageSize);
-        List<Map<String, Object>> columnList = wmspGridMaterialService.selectGridMaterial(mapVal,warehouseId);
+        List<Map<String, Object>> columnList = wmspGridMaterialService.selectGridMaterial(mapVal,warehouseId,time);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, libaryInBoundList, columnList);
 //        //库龄预警
 //        for (Map mapValue : columnList) {

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

@@ -28,7 +28,7 @@ public interface IWmspGridMaterialService  {
    int updateByPrimaryKeySelective(WmspGridMaterial wmspGridMaterial);
 
    //查询实时库存数据
-   List<Map<String, Object>> selectGridMaterial(Map<String, Object> mapval,Integer warehouseId);
+   List<Map<String, Object>> selectGridMaterial(Map<String, Object> mapval,String warehouseId,String time);
 
    //统计实时库存当前表格数据
    Long countByGmId();

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

@@ -65,11 +65,17 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
     }
     //查询实时库存数据
     @Override
-    public List<Map<String, Object>> selectGridMaterial(Map<String, Object> mapval,Integer warehouseId) {
+    public List<Map<String, Object>> selectGridMaterial(Map<String, Object> mapval,String warehouseId,String time) {
         //        通过当前时间获得前一个月的时间
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar cal= Calendar.getInstance();
-        cal.add(Calendar.MONTH, -1);
+//        根据前端床过来的time的数值进行时间区间的判断
+        if (time.equals("1")){
+            cal.add(Calendar.MONTH, -1);
+        }else if (time.equals("2")){
+            cal.add(Calendar.DATE, -15);
+        }
+
         long date2 = cal.getTimeInMillis();
         String newDate=simpleDateFormat.format(new Date(date2));
         mapval.put("warehouseId",warehouseId);

src/main/resources/bootstrap.yml

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

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

@@ -446,7 +446,12 @@
     on RM.MATERIAL_TYPE_ID=RMT.MATERIAL_TYPE_ID
     left join WMSP_INBOUND_RESULT WIR
     on WIR.MATERIAL_ID = WGM.MATERIAL_ID
-    where RPG.WAREHOUSE_ID = #{warehouseId} AND WGM.DELETED = 0 and WIR.INBOUND_ISCOMPLETE = 1 order by WGM.INSERT_TIME DESC
+    where WGM.DELETED = 0
+      and WIR.INBOUND_ISCOMPLETE = 1
+    <if test="warehouseId!=0">
+        and RPG.WAREHOUSE_ID = #{warehouseId}
+    </if>
+    order by WGM.INSERT_TIME DESC
     )
    <if test="con!=null">
     where "materialName" like #{con} or "warehouseName" like #{con} or "stackingNo" like #{con}

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

@@ -367,18 +367,32 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="selectTransitInventory" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
-    select  RC.CAPACITY_NUMBER "number",
+    select
+--            运力编号
+            RC.CAPACITY_NUMBER "number",
+--             车皮号
             OOT.ORDER_WAGON_NO "No",
+--            发运计划号
             ARD.DAYPLAN_NO "dayplanNo",
+--            运输订单号
             OO.ORDER_NUMBER "orderNumber",
+--            物资编码
             RM.MATERIAL_CODE "materialCode",
+--            物资名称
             RM.MATERIAL_NAME "materialName",
+--            物资规格加型号
             RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "specification",
+--            物资生产下线重量
             RMS.MATERIAL_SINGLE_BUNDLE_WEIGHT  "bundleWeight",
+--            物资理重
             RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+--            物资件数
             OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+--            磅单号
             TWR.RESULT_POUND_NO "poundNo",
+--            仓库名称
             RW.WAREHOUSE_NAME "warehouseName",
+--            物资入库时间
             WII.INSERT_TIME "insertTime"
 
            from WMSP_INTRANSIT_INVENTORY WII