下架开发完成

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownBiz.java

@@ -1,79 +1,78 @@
-//package com.emato.cus.supervise.biz.acqShelfLoad;
-//
-//import com.emato.cus.supervise.biz.CusWmsTask;
-//import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
-//import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
-//import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
-//import com.emato.cus.supervise.util.LocalDateTimeUtils;
-//import com.google.common.collect.Maps;
-//import org.apache.commons.lang3.StringUtils;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @author zengjunlin
-// * @version 1.0
-// * 2018-02-03 11:25
-// */
-//@Component
-//public class AcqShelfLoadDownBiz implements CusWmsTask{
-//
-//    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownBiz.class);
-//
-//    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode() + "]" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getName();
-//
-//    @Autowired
-//    private AcqShelfLoadRecordTime acqShelfLoadRecordTime;
-//
-//    @Autowired
-//    private AcqShelfLoadCusData acqShelfLoadCusData;
-//
-//    @Autowired
-//    private AcqShelfLoadWmsData acqShelfLoadWmsData;
-//
-//    @Autowired
-//    private AcqShelfLoadDataConversion acqShelfLoadDataConversion;
-//
-//    /**
-//     * 任务入口
-//     */
-//    @Override
-//    public void task() {
-//        // 获取扫描时间
-//        String oldThisTime = acqShelfLoadRecordTime.getEmtRecordTime();
-//        if (StringUtils.isBlank(oldThisTime)) {
-//            logger.info("--- 【" + DATA_TYPE_INFO + "】未获取到本次扫描时间, 本次扫描提前结束！！！");
-//            //下次扫描时间
-//            acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
-//                    LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN));
-//            return;
-//
-//        }
-//
-//        // 扫描WMS 数据
-//        List<WmsAcqShelfLoad> wmsList = acqShelfLoadWmsData.getWmsData(oldThisTime);
-//        if (wmsList == null || wmsList.size() == 0) {
-//            logger.info("--- 【" + DATA_TYPE_INFO + "】获取到本次扫描数据为空, 不执行写数据操作, 本次扫描提前结束！！！");
-//            //下次扫描时间
-//            acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
-//                    LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN));
-//            return;
-//        }
-//        Map params = Maps.newHashMap();
-//        params.put("wmsList",wmsList);
-//        //组装CUS 数据
-//        List<CusAcqShelfLoad04> cusList = acqShelfLoadDataConversion.conversion(params);
-//
-//        // 写CUS 数据
-//        int res = acqShelfLoadCusData.insertCus(cusList);
-//
-//        // 更新扫描时间
-//        boolean bl = acqShelfLoadRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
-//                oldThisTime);
-//    }
-//}
+package com.emato.cus.supervise.biz.acqShelfLoad.down;
+
+import com.emato.cus.supervise.biz.CusWmsTask;
+import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
+import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
+import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
+import com.emato.cus.supervise.util.LocalDateTimeUtils;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengjunlin
+ * @version 1.0
+ * 2018-02-03 11:25
+ */
+@Component
+public class AcqShelfLoadDownBiz implements CusWmsTask{
+
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownBiz.class);
+
+    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode() + "]" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getName();
+
+    @Autowired
+    private AcqShelfLoadDownRecordTime acqShelfLoadDownRecordTime;
+
+    @Autowired
+    private AcqShelfLoadDownCusData acqShelfLoadDownCusData;
+
+    @Autowired
+    private AcqShelfLoadDownWmsData acqShelfLoadDownWmsData;
+
+    @Autowired
+    private AcqShelfLoadDownDataConversion acqShelfLoadDownDataConversion;
+
+    /**
+     * 任务入口
+     */
+    @Override
+    public void task() {
+        // 获取扫描时间
+        String oldThisTime = acqShelfLoadDownRecordTime.getEmtRecordTime();
+        if (StringUtils.isBlank(oldThisTime)) {
+            logger.info("--- 【" + DATA_TYPE_INFO + "】未获取到本次扫描时间, 本次扫描提前结束！！！");
+            //下次扫描时间
+            acqShelfLoadDownRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+                    LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN));
+            return;
+
+        }
+        // 扫描WMS 数据
+        List<WmsAcqShelfLoad> wmsList = acqShelfLoadDownWmsData.getWmsData(oldThisTime);
+        if (wmsList == null || wmsList.size() == 0) {
+            logger.info("--- 【" + DATA_TYPE_INFO + "】获取到本次扫描数据为空, 不执行写数据操作, 本次扫描提前结束！！！");
+            //下次扫描时间
+            acqShelfLoadDownRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+                    LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN));
+            return;
+        }
+        Map params = Maps.newHashMap();
+        params.put("wmsList",wmsList);
+        //组装CUS 数据
+        List<CusAcqShelfLoad04> cusList = acqShelfLoadDownDataConversion.conversion(params);
+
+        // 写CUS 数据
+        int res = acqShelfLoadDownCusData.insertCus(cusList);
+
+        // 更新扫描时间
+        boolean bl = acqShelfLoadDownRecordTime.updateWmsRecordTime(LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN),
+                oldThisTime);
+    }
+}

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownCusData.java

@@ -0,0 +1,43 @@
+package com.emato.cus.supervise.biz.acqShelfLoad.down;
+
+import com.emato.cus.supervise.biz.CusData;
+import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
+import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
+import com.emato.cus.supervise.service.cus.CusAcqShelfLoadService04;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 货物上下架数据 下架 CUS
+ * @author Scott Chen
+ * @version 1.0
+ * 2017-10-31 12:38
+ */
+@Component
+public class AcqShelfLoadDownCusData implements CusData {
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownCusData.class);
+
+    @Autowired
+    private CusAcqShelfLoadService04 cusAcqShelfLoadService04;
+
+    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode() + "]" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getName();
+
+
+    @Override
+    public int insertCus(List<?> list) {
+        logger.info("---------- 货物上下架数据::下架::写入本次监控数据开始 --------------------");
+
+        List<CusAcqShelfLoad04> cusList = (List<CusAcqShelfLoad04>) list;
+
+        int result = cusAcqShelfLoadService04.addCusAcqShelfLoad04(cusList);
+
+        logger.info("---【" + DATA_TYPE_INFO + "】写入监控数据:{} 条", result);
+
+        logger.info("---------- 货物上下架数据::下架::写入本次监控数据结束 --------------------");
+        return result;
+    }
+}

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownDataConversion.java

@@ -0,0 +1,68 @@
+package com.emato.cus.supervise.biz.acqShelfLoad.down;
+
+import com.emato.cus.supervise.biz.DataConversion;
+import com.emato.cus.supervise.constant.Dict;
+import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
+import com.emato.cus.supervise.domainCus.CusAcqShelfLoad04;
+import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author zengjunlin
+ * @version 1.0
+ * 2018-02-03 13:40
+ */
+@Component
+public class AcqShelfLoadDownDataConversion implements DataConversion {
+
+
+    private final static Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownDataConversion.class);
+
+    /**
+     * 企业货物上下架信息组装
+     * 外部数据转换
+     * @param params
+     * @return
+     */
+    @Override
+    public List conversion(Map params) {
+        logger.info("开始转换oms，wms 组装cus数据===========================");
+        List<WmsAcqShelfLoad> wmsList = (List<WmsAcqShelfLoad>) params.get("wmsList");
+        List<CusAcqShelfLoad04> cusAcqShelfLoad04List = Lists.newArrayList();
+        for (int i = 0; i < wmsList.size(); i++) {
+            WmsAcqShelfLoad wmsAcqShelfLoad = wmsList.get(i);
+            CusAcqShelfLoad04 cusAcqShelfLoad04 = new CusAcqShelfLoad04();
+            cusAcqShelfLoad04.setId(wmsAcqShelfLoad.getId());
+            cusAcqShelfLoad04.setGoodsName(wmsAcqShelfLoad.getGoodsName());
+            cusAcqShelfLoad04.setCodeTs(wmsAcqShelfLoad.getCodeTs());
+            cusAcqShelfLoad04.setFormNoDec(wmsAcqShelfLoad.getFormNoDec());
+            cusAcqShelfLoad04.setFormNo(wmsAcqShelfLoad.getFormNo());
+            cusAcqShelfLoad04.setSkuNo(wmsAcqShelfLoad.getSkuNo());
+            cusAcqShelfLoad04.setGoodsId(wmsAcqShelfLoad.getGoodsId());
+            cusAcqShelfLoad04.setgUnit(wmsAcqShelfLoad.getgUnit());
+            cusAcqShelfLoad04.setgQty(wmsAcqShelfLoad.getgQty());
+            cusAcqShelfLoad04.setLegalUnit(wmsAcqShelfLoad.getLegalUnit());
+            cusAcqShelfLoad04.setLegalQty(wmsAcqShelfLoad.getLegalQty());
+            cusAcqShelfLoad04.setGoodsModel(wmsAcqShelfLoad.getGoodsModel());
+            cusAcqShelfLoad04.setLocalEmsNo(Dict.localEmsNo);
+            cusAcqShelfLoad04.setSeatNo(wmsAcqShelfLoad.getSeatNo());
+            cusAcqShelfLoad04.setShelfLoadTime(wmsAcqShelfLoad.getShelfLoadTime());
+            cusAcqShelfLoad04.setShelfLoadType(wmsAcqShelfLoad.getShelfLoadType());
+            cusAcqShelfLoad04.setStoreCompanyName(Dict.storeCompanyName);
+            cusAcqShelfLoad04.setStoreUscCode(Dict.storeUscCode);
+            cusAcqShelfLoad04.setStoreCustomsCode(Dict.storeCustomsCode);
+            cusAcqShelfLoad04.setStoreCode(Dict.storeCode);
+            cusAcqShelfLoad04.setCreateTime(LocalDateTime.now());
+            cusAcqShelfLoad04List.add(cusAcqShelfLoad04);
+        }
+        logger.info("转换oms，wms 组装cus数据结束===========================");
+        return cusAcqShelfLoad04List;
+    }
+}

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownRecordTime.java

@@ -0,0 +1,101 @@
+package com.emato.cus.supervise.biz.acqShelfLoad.down;
+
+import com.emato.cus.supervise.biz.RecordTime;
+import com.emato.cus.supervise.biz.acqShelfLoad.up.AcqShelfLoadUpRecordTime;
+import com.emato.cus.supervise.constant.CommonConstant;
+import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
+import com.emato.cus.supervise.domainCus.EmtRecordTime;
+import com.emato.cus.supervise.service.cus.EmtRecordTimeService;
+import com.emato.cus.supervise.util.LocalDateTimeUtils;
+import com.google.common.collect.ImmutableMap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengjunlin
+ * @version 1.0
+ * 2018-02-03 14:34
+ */
+@Component
+public class AcqShelfLoadDownRecordTime implements RecordTime{
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadUpRecordTime.class);
+
+    @Autowired
+    private EmtRecordTimeService emtRecordTimeService;
+
+    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode() + "]" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getName();
+
+    /**
+     * 获取扫描时间
+     * @return
+     */
+    @Override
+    public String getEmtRecordTime() {
+        logger.info("---------- 货物上下架数据::下架::获取上次扫描时间开始 --------------------");
+
+        //根据数据类型, 取扫描时间
+        Map<String, Object> param = ImmutableMap.of("dataType", EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode());
+
+        List<EmtRecordTime> list = emtRecordTimeService.selectEmtRecordTime(param);
+        if (list == null || list.size() == 0) {
+            String err = "---【" + DATA_TYPE_INFO + "】取扫描时间数据为空.";
+            logger.error(err);
+            return null;
+        }
+
+        String oldLastTime = list.get(0).getLastTime();
+        String oldThisTime = list.get(0).getThisTime();
+
+        logger.info("---【" + DATA_TYPE_INFO + "】任务上次扫描时间:{}", oldLastTime);
+        logger.info("---【" + DATA_TYPE_INFO + "】任务本次扫描时间:{}", oldThisTime);
+
+        logger.info("---------- 货物上下架数据::下架::获取上次扫描时间结束 --------------------");
+        return oldThisTime;
+    }
+
+    /**
+     * 更新记录时间
+     *
+     * @param thisTime 当前时间作为下次扫描时间
+     * @param lastTime 本次扫描时间成为上次扫描时间
+     */
+    @Override
+    public boolean updateWmsRecordTime(String thisTime, String lastTime) {
+        logger.info("---------- 货物上下架数据::下架::更新扫描时间开始 --------------------");
+
+        if (StringUtils.isBlank(thisTime)) {
+            thisTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
+        }
+        if (StringUtils.isBlank(lastTime)) {
+            logger.info("---【" + DATA_TYPE_INFO + "】本次更新时间为空, 不能写入扫描时间表, 更新扫描时间提前结束.");
+            return false;
+        }
+
+        logger.info("---【" + DATA_TYPE_INFO + "】本次扫描时间为:{}, 下次扫描时间:{}.", lastTime, thisTime);
+
+        ImmutableMap.Builder builder = new ImmutableMap.Builder();
+        builder.put("dataType", EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode());
+        builder.put("lastTime", lastTime);
+        builder.put("thisTime", thisTime);
+        builder.put("moderSn", CommonConstant.moderSn);
+        builder.put("modTime", LocalDateTime.now());
+
+        int res = emtRecordTimeService.updateEmtRecordTime(builder.build());
+        String err = "---【" + DATA_TYPE_INFO + "】更新扫描时间'{" + (res == 1 ? "成功" : "失败, 结束本次扫描!!!") + "}'.";
+        logger.info(err);
+        if (res != 1) {
+            return false;
+        }
+
+        logger.info("---------- 货物上下架数据::下架::更新扫描时间结束 --------------------");
+
+        return res == 1;
+    }
+}

src/main/java/com/emato/cus/supervise/biz/acqShelfLoad/down/AcqShelfLoadDownWmsData.java

@@ -0,0 +1,57 @@
+package com.emato.cus.supervise.biz.acqShelfLoad.down;
+
+import com.emato.cus.supervise.biz.WmsData;
+import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
+import com.emato.cus.supervise.domain.WmsAcqShelfLoad;
+import com.emato.cus.supervise.service.wms.WmsAcqShelfLoadService;
+import com.google.common.collect.ImmutableMap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 货物上下架数据 下架 WMS
+ * @author Scott Chen
+ * @version 1.0
+ * 2017-10-31 12:24
+ */
+@Component
+public class AcqShelfLoadDownWmsData implements WmsData {
+    private static final Logger logger = LoggerFactory.getLogger(AcqShelfLoadDownWmsData.class);
+
+    @Autowired
+    private WmsAcqShelfLoadService wmsAcqShelfLoadService;
+
+    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getCode() + "]" + EmtRecordTimeEnum.ACQ_SHELF_LOAD_DOWN.getName();
+
+
+    @Override
+    public List getWmsData(String thisTime) {
+        logger.info("---------- 货物上下架数据::下架::获取本次监控数据开始 --------------------");
+
+        if (StringUtils.isBlank(thisTime)) {
+            String err = "---【" + DATA_TYPE_INFO + "】本次扫描时间为空.";
+            logger.error(err);
+            return Collections.EMPTY_LIST;
+        }
+
+        ImmutableMap param = ImmutableMap.of("thisTime", thisTime);
+        List<WmsAcqShelfLoad> resultList = wmsAcqShelfLoadService.getWmsAcqShelfLoadDown(param);
+
+        if (resultList == null || resultList.size() == 0) {
+            String err = "---【" + DATA_TYPE_INFO + "】获取本次监控数据为空.";
+            logger.error(err);
+            return Collections.EMPTY_LIST;
+        }
+        logger.info("---【" + DATA_TYPE_INFO + "】获取本次监控数据{}条.", resultList.size());
+
+        logger.info("---------- 货物上下架数据::下架::获取本次监控数据结束 --------------------");
+
+        return resultList;
+    }
+}

src/main/java/com/emato/cus/supervise/constant/EmtRecordTimeEnum.java

@@ -7,14 +7,9 @@ package com.emato.cus.supervise.constant;
  */
 public enum EmtRecordTimeEnum {
     I_ACQ_INVENTORY_INFO("ACQ_INVENTORY_INFO", "企业库存信息"),
-    ACQ_SHELF_LOAD("ACQ_SHELF_LOAD", "企业货物上下架信息"),
-    ACQ_SHELF_LOAD_DOWN("ACQ_SHELF_LOAD", "企业货物上下架信息:下架"),
-    I_00("00", "货物库存数据"),
-    I_01_01("01_01", "货物上下架_上架"),
-    I_01_02("01_02", "货物上下架_退港"),
-    I_01_03("01_03", "货物上下架_正常拣货"),
-    I_02("02", "货物库位移动数据"),
-    I_03("03", "库位货物");
+    ACQ_SHELF_LOAD("ACQ_SHELF_LOAD", "企业货物上下架信息:上架"),
+    ACQ_SHELF_LOAD_DOWN("ACQ_SHELF_LOAD_DOWN", "企业货物上下架信息:下架")
+    ;
 
     private String code;
     private String name;

src/main/java/com/emato/cus/supervise/mapper/WmsAcqShelfLoadMapper.java

@@ -12,4 +12,6 @@ import java.util.Map; /**
 @Repository
 public interface WmsAcqShelfLoadMapper {
     List<WmsAcqShelfLoad> getWmsAcqShelfLoadUp(Map<String, Object> param);
+
+    List<WmsAcqShelfLoad> getWmsAcqShelfLoadDown(Map<String, Object> param);
 }

src/main/java/com/emato/cus/supervise/schedule/AcqShelfLoadSchedule.java

@@ -1,6 +1,6 @@
 package com.emato.cus.supervise.schedule;
 
-import com.emato.cus.supervise.biz.acqShelfLoad.AcqShelfLoadDownBiz;
+import com.emato.cus.supervise.biz.acqShelfLoad.down.AcqShelfLoadDownBiz;
 import com.emato.cus.supervise.biz.acqShelfLoad.up.AcqShelfLoadUpBiz;
 import com.emato.cus.supervise.util.LocalDateTimeUtils;
 import org.slf4j.Logger;
@@ -34,7 +34,8 @@ public class AcqShelfLoadSchedule {
      * 上架
      */
     //每月1号开始,每天10,18点执行各1次,共2次
-    @Scheduled(cron = "0 0 10,18 1/1 * ?")
+    //@Scheduled(cron = "0 0 10,18 1/1 * ?")
+    @Scheduled(cron = "0/10 * * * * ? ")
     public void timerUp() {
         logger.info("==================== 货物上下架数据::上架::监控数据读取开始 ====================");
         String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
@@ -42,7 +43,6 @@ public class AcqShelfLoadSchedule {
 
         acqShelfLoadUpBiz.task();
 
-
         String endDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
         logger.info("--- 任务结束时间: {}", endDateTime);
         logger.info("==================== 货物上下架数据::上架::监控数据读取结束 ====================");
@@ -53,8 +53,7 @@ public class AcqShelfLoadSchedule {
      * 下架
      */
     //每月1号开始,每天18点执行1次,共1次
-    //@Scheduled(cron = "0 0 18 1/1 * ?")
-    @Scheduled(cron = "0/10 * * * * ? ")
+    @Scheduled(cron = "0 0 18 1/1 * ?")
     public void timerDown() {
         logger.info("==================== 货物上下架数据::下架::监控数据读取开始 ====================");
         String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);

src/main/java/com/emato/cus/supervise/service/wms/WmsAcqShelfLoadService.java

@@ -18,4 +18,12 @@ public interface WmsAcqShelfLoadService {
      * @return
      */
     List<WmsAcqShelfLoad> getWmsAcqShelfLoadUp(Map<String, Object> param);
+
+
+    /**
+     * 货物上下架数据 上架
+     * @param param
+     * @return
+     */
+    List<WmsAcqShelfLoad> getWmsAcqShelfLoadDown(Map<String, Object> param);
 }

src/main/java/com/emato/cus/supervise/service/wms/impl/WmsAcqShelfLoadServiceImpl.java

@@ -29,5 +29,17 @@ public class WmsAcqShelfLoadServiceImpl implements WmsAcqShelfLoadService {
         return wmsAcqShelfLoadMapper.getWmsAcqShelfLoadUp(param);
     }
 
+    /**
+     * 货物上下架数据 上架
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    @Transactional(value ="primaryTransactionManager")
+    public List<WmsAcqShelfLoad> getWmsAcqShelfLoadDown(Map<String, Object> param) {
+        return wmsAcqShelfLoadMapper.getWmsAcqShelfLoadDown(param);
+    }
+
 
 }

src/main/resources/mybatis/mapper/wms-acq-shelf-load.xml

@@ -14,7 +14,7 @@
 				rc.quantity AS gQty,
 				rc.toLocation AS seatNo,
 				i.unitDesc AS gUnit,
-				'E' AS shelfLoadType,
+				'I' AS shelfLoadType,
 				i.`name` AS goodsName,
 				CONCAT(
 					i.itemSize,
@@ -33,4 +33,34 @@
 		</where>
     </select>
 
+	<!-- 企业货物上下架信息： 下架查询 -->
+	<select id="getWmsAcqShelfLoadDown" parameterType="java.util.Map"
+			resultType="com.emato.cus.supervise.domain.WmsAcqShelfLoad">
+		SELECT
+		i.`name` AS goodsName,
+		itemCode AS codeTs,
+		itemCode AS skuNo,
+		itemCode AS goodsId,
+		quantity AS gQty,
+		i.unitDesc AS gUnit,
+		CONCAT(
+		i.itemSize,
+		'-',
+		i.itemColor,
+		'-',
+		i.itemStyle
+		) AS goodsModel,
+		originalPickLoc AS seatNo,
+		scd.created AS shelfLoadTime,
+		'E' AS shelfLoadType
+		FROM
+		Shipping_container_detail scd
+		LEFT JOIN item i ON scd.itemCode = i.`code`
+		<where>
+			<if test="thisTime != null">
+				scd.created &gt;= #{thisTime}
+			</if>
+		</where>
+	</select>
+
 </mapper>

src/sql/emt-record-time-2.0.sql

@@ -4,6 +4,11 @@ INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create
   'ACQ_INVENTORY_INFO', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
 );
 -- 企业货物上下架信息
+--上架
 INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create_time, moder_sn, mod_time) VALUES (
   'ACQ_SHELF_LOAD', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
+);
+--下架
+INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create_time, moder_sn, mod_time) VALUES (
+  'ACQ_SHELF_LOAD_DOWN', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
 );

src/sql/wms-data-2.0.sql

@@ -10,4 +10,46 @@
 		LEFT JOIN item i ON li.itemCode = i. CODE
 		GROUP BY
 		li.itemCode
-
+-----------------企业货物上下架信息
+-- 上架
+SELECT
+				rc.created AS shelfLoadTime,
+				rc.itemCode AS skuNo,
+				rc.itemCode AS codeTs,
+				rc.itemCode AS goodsId,
+				rc.quantity AS gQty,
+				rc.toLocation AS seatNo,
+				i.unitDesc AS gUnit,
+				'I' AS shelfLoadType,
+				i.`name` AS goodsName,
+				CONCAT(
+					i.itemSize,
+					'-',
+					i.itemColor,
+					'-',
+					i.itemStyle
+				) AS goodsModel
+			FROM
+				receipt_container rc
+			LEFT JOIN item i ON rc.itemcode = i. CODE
+-- 下架
+SELECT
+	i.`name` AS goodsName,
+	itemCode AS codeTs,
+	itemCode AS skuNo,
+	itemCode AS goodsId,
+	quantity AS gQty,
+	i.unitDesc AS gUnit,
+	CONCAT(
+		i.itemSize,
+		'-',
+		i.itemColor,
+		'-',
+		i.itemStyle
+	) AS goodsModel,
+	originalPickLoc AS seatNo,
+	scd.created AS shelfLoadTime,
+	'E' AS shelfLoadType
+FROM
+	Shipping_container_detail scd
+LEFT JOIN item i ON scd.itemCode = i.`code`;