Merge branch 'master' of http://git.ds-bay.com/project/cus-wms-supervise2.0

src/main/java/com/emato/cus/supervise/biz/OutFee/OutFeeBiz.java

@@ -0,0 +1,85 @@
+package com.emato.cus.supervise.biz.OutFee;
+
+import com.emato.cus.supervise.biz.CusWmsTask;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpCusData;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpDataConversion;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpRecordTime;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpWmsData;
+import com.emato.cus.supervise.biz.acqInventoryInfo.AcqInventoryInfoOmsData;
+import com.emato.cus.supervise.constant.EmtRecordTimeEnum;
+import com.emato.cus.supervise.domain.WmsAcqGoodsMove;
+import com.emato.cus.supervise.domainCus.CusAcqGoodsMove05;
+import com.emato.cus.supervise.domainOms.OmsProductInfo;
+import com.emato.cus.supervise.util.GsonUtil;
+import com.emato.cus.supervise.util.LocalDateTimeUtils;
+import com.google.common.collect.Lists;
+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 15:21
+ */
+@Component
+public class OutFeeBiz implements CusWmsTask {
+    private static final Logger logger = LoggerFactory.getLogger(OutFeeBiz.class);
+
+    @Autowired
+    private AcqGoodsMoveUpWmsData acqGoodsMoveUpWmsData;
+
+    @Autowired
+    private AcqGoodsMoveUpCusData acqGoodsMoveUpCusData;
+
+    @Autowired
+    private AcqGoodsMoveUpDataConversion acqGoodsMoveUpDataConversion;
+
+    @Autowired
+    private AcqInventoryInfoOmsData acqInventoryInfoOmsData;
+
+    private static final String DATA_TYPE_INFO = "[" + EmtRecordTimeEnum.ACQ_GOODS_MOVE_UP.getCode() + "]" + EmtRecordTimeEnum.ACQ_GOODS_MOVE_UP.getName();
+
+
+    /**
+     * 任务入口
+     */
+    @Override
+    public void task() {
+
+
+        // 扫描旧系统数据，
+//        List<WmsAcqGoodsMove> wmsList = acqGoodsMoveUpWmsData.getWmsData(oldThisTime);
+//        if (wmsList == null || wmsList.size() == 0) {
+//            logger.info("--- 【" + DATA_TYPE_INFO + "】获取到本次扫描数据为空, 不执行写数据操作, 本次扫描提前结束！！！");
+//            return;
+//        }
+//
+//        List<String> skuList = Lists.newArrayList();
+//        wmsList.forEach(i -> skuList.add(i.getSkuNo()));
+//
+//        List<OmsProductInfo> productList = acqInventoryInfoOmsData.getOmsProductData(skuList);
+//
+//        if (productList == null || productList.isEmpty()) {
+//            logger.error("oms扫描到的数据" + GsonUtil.toJson(productList));
+//            logger.info("--- 【" + DATA_TYPE_INFO + "】获取到本次扫描OMS数据为空, 不执行写数据操作, 本次扫描提前结束！！！");
+//            return;
+//        }
+//
+//        Map params = Maps.newHashMap();
+//        params.put("wmsList",wmsList);
+//        params.put("productInfoList", productList);
+//        //将wms数据转换cus
+//        List<CusAcqGoodsMove05> cusList = acqGoodsMoveUpDataConversion.conversion(params);
+//
+//        // 写CUS 数据
+//        int res = acqGoodsMoveUpCusData.insertCus(cusList);
+
+    }
+}

src/main/java/com/emato/cus/supervise/biz/acqGoodsSeat/AcqGoodsOnSeatCusData.java

@@ -11,8 +11,8 @@ 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;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -43,9 +43,20 @@ public class AcqGoodsOnSeatCusData implements CusData {
 
         List<CusAcqGoodsSeat06> cusList = (List<CusAcqGoodsSeat06>) list;
 
+        // 新增库存list
+        List<CusAcqGoodsSeat06> insertList = new ArrayList<>();
+        // 修改库存list
+        List<CusAcqGoodsSeat06> updateList = new ArrayList<>();
+        // 删除库存list
+        List<CusAcqGoodsSeat06> deleteList = new ArrayList<>();
+
         List<String> gUnitNameList = Lists.newArrayList();
         cusList.forEach(i -> gUnitNameList.add(i.getgUnit()));
 
+        // 查询已有库存信息表对应sku数据
+        List<CusAcqGoodsSeat06> listgoodsSeat = cusAcqGoodsSeatService06.listCusAcqGoodsSeat(cusList);
+        Map<String, String> exitGoodsSeat = listgoodsSeat.stream().collect(Collectors.toMap(k->k.getSkuNo()+k.getSeatNo(), v->v.getId()));
+
         List<OmsCusUnitCode> codeList = omsCusUnitCodeMapper.getOmsCusUnitCodeList(gUnitNameList);
         Map<String,OmsCusUnitCode> omsCusUnitCodeMap = codeList.stream().collect(Collectors.toMap(k->k.getgUnitName(), v->v));
 
@@ -54,13 +65,42 @@ public class AcqGoodsOnSeatCusData implements CusData {
             if(omsProductInfo != null) {
                 seat.setgUnit(omsProductInfo.getgUnitCode());
             }
+
+            String key = seat.getSkuNo() + seat.getSeatNo();
+            if (exitGoodsSeat.containsKey(key)) {
+                if (seat.getgQty().intValue() != 0) {
+                    // 存在并且库存不为0, 则更新
+                    updateList.add(seat);
+                } else {
+                    // 存在并库存为0，则删除
+                    seat.setId(exitGoodsSeat.get(key));
+                    deleteList.add(seat);
+                }
+            } else {
+                if (seat.getgQty().intValue() != 0) {
+                    // 不存在并且库存不为0, 则插入
+                    insertList.add(seat);
+                }
+            }
         }
 
-        int result = cusAcqGoodsSeatService06.addCusAcqGoodsSeat06(cusList);
+        int insertResult = 0;
+        int updateResult = 0;
+        int deleteResult = 0;
+
+        if (insertList.size() > 0) {
+            insertResult = cusAcqGoodsSeatService06.addCusAcqGoodsSeat06(insertList);
+        }
+        if (updateList.size() > 0) {
+            updateResult = cusAcqGoodsSeatService06.updateCusAcqGoodsSeat06(updateList);
+        }
+        if (deleteList.size() > 0) {
+            deleteResult = cusAcqGoodsSeatService06.deleteCusAcqGoodsSeat06(deleteList);
+        }
 
-        logger.info("---【" + DATA_TYPE_INFO + "】写入监控数据:{} 条", result);
+        logger.info("---【" + DATA_TYPE_INFO + "】写入监控数据:{} 条, 更新监控数据:{}条, 删除监控数据：{}条", insertResult, updateResult, deleteResult);
 
         logger.info("---------- 库位货物数据::写入本次监控数据结束 --------------------");
-        return result;
+        return insertResult + updateResult + deleteResult;
     }
 }

src/main/java/com/emato/cus/supervise/biz/acqInventoryInfo/AcqInventoryInfoCusData.java

@@ -70,24 +70,24 @@ public class AcqInventoryInfoCusData implements CusData {
                 });
         // 查询已有库存信息表对应sku数据
         List<CusAcqInventoryInfo03> listInveInfo = cusAcqInventoryInfoService03.listCusAcqInventoryInfo(listSku);
-        Map<String, String> exitInveInfo = listInveInfo.stream().collect(Collectors.toMap(i -> i.getSkuNo(), i -> i.getLocalEmsNo()));
+        Map<String, String> exitInveInfo = listInveInfo.stream().collect(Collectors.toMap(k->k.getSkuNo(), v->v.getLocalEmsNo()));
 
 
         List<OmsCusUnitCode> codeList = omsCusUnitCodeMapper.getOmsCusUnitCodeList(gUnitNameList);
         Map<String,OmsCusUnitCode> omsCusUnitCodeMap = codeList.stream().collect(Collectors.toMap(k->k.getgUnitName(), v->v));
 
-        for (CusAcqInventoryInfo03 seat:cusList) {
-            OmsCusUnitCode omsProductInfo = omsCusUnitCodeMap.get(seat.getGUnit());
+        for (CusAcqInventoryInfo03 info:cusList) {
+            OmsCusUnitCode omsProductInfo = omsCusUnitCodeMap.get(info.getGUnit());
             if(omsProductInfo != null) {
-                seat.setGUnit(omsProductInfo.getgUnitCode());
+                info.setGUnit(omsProductInfo.getgUnitCode());
             }
 
-            if (exitInveInfo.containsKey(seat.getSkuNo())) {
+            if (exitInveInfo.containsKey(info.getSkuNo())) {
                 // 存在, 则更新
-                updateList.add(seat);
+                updateList.add(info);
             } else {
                 // 不存在, 则插入
-                insertList.add(seat);
+                insertList.add(info);
             }
 
         }

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

@@ -9,7 +9,7 @@ public class Dict {
     // 园区账册号(改为货主金二账册编号，每个货主各一个)
     // public static final String localEmsNo = "I440366000315001";
     // 仓库使用企业名称
-    public static final String storeCompanyName = "深圳前海电商供应链管理有限公司";
+    public static final String storeCompanyName = "前海电商（深圳）供应链集团有限公司";
     // 仓库使用企业社会信用代码
     public static final String storeUscCode = "440301111758322";
     // 仓库使用企业海关编码

src/main/java/com/emato/cus/supervise/mapperCus/CusAcqGoodsSeatMapper06.java

@@ -20,4 +20,10 @@ public interface CusAcqGoodsSeatMapper06 {
      * @return
      */
     int addCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list);
+
+    List<CusAcqGoodsSeat06> listCusAcqGoodsSeat(List<CusAcqGoodsSeat06> list);
+
+    int updateCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list);
+
+    int deleteCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list);
 }

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

@@ -30,7 +30,7 @@ public class AcqGoodsMoveSchedule {
      */
     //每月1号开始,每天12,18点执行各1次,共2次
     @Scheduled(cron = "0 0 12,18 1/1 * ?")
-//    @Scheduled(cron = "0/10 * * * * ? ")
+//    @Scheduled(cron = "0 0/1 * * * ? ")
     public void timerUp() {
         logger.info("==================== 货物库位移动数据:上架:监控数据读取开始 ====================");
         String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);

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

@@ -31,6 +31,7 @@ public class AcqGoodsSeatSchedule {
      */
     //每月1号开始,每天10,12,15,18,22点各1次,共5次
     @Scheduled(cron = "0 0 10,12,15,18,22 1/1 * ?")
+//    @Scheduled(cron = "0 0/1 * * * ? ")
     public void timerUp() {
         logger.info("==================== 库位货物数据::监控数据读取开始 ====================");
         String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);

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

@@ -29,6 +29,7 @@ public class AcqInventoryInfoSchedule {
      */
     //每月1号开始,每天12,22点各1次,共2次
     @Scheduled(cron = "0 0 12,22 1/1 * ?")
+//    @Scheduled(cron = "0 0/1 * * * ? ")
     public void timer() {
         logger.info("==================== 货物库存数据::监控数据读取开始 ====================");
         String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);

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

@@ -35,6 +35,7 @@ public class AcqShelfLoadSchedule {
      */
     //每月1号开始,每天10,18点执行各1次,共2次
     @Scheduled(cron = "0 0 10,18 1/1 * ?")
+//    @Scheduled(cron = "0 0/1 * * * ? ")
     public void timerUp() {
         logger.info("==================== 货物上下架数据::上架::监控数据读取开始 ====================");
         String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
@@ -53,6 +54,7 @@ public class AcqShelfLoadSchedule {
      */
     //每月1号开始,每天18点执行1次,共1次
     @Scheduled(cron = "0 0 18 1/1 * ?")
+//    @Scheduled(cron = "0 0/1 * * * ? ")
     public void timerDown() {
         logger.info("==================== 货物上下架数据::下架::监控数据读取开始 ====================");
         String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);

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

@@ -0,0 +1,47 @@
+package com.emato.cus.supervise.schedule;
+
+import com.emato.cus.supervise.biz.OutFee.OutFeeBiz;
+import com.emato.cus.supervise.biz.acqGoodsMoveSchedule.up.AcqGoodsMoveUpBiz;
+import com.emato.cus.supervise.util.LocalDateTimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ *
+ * 货物库位移动数据 计划任务
+ * @author zengjunlin
+ * @version 1.0
+ * 2018-02-03 15:18
+ */
+@Configuration
+@EnableScheduling
+public class OutFeeSchedule {
+    private static final Logger logger = LoggerFactory.getLogger(OutFeeSchedule.class);
+
+    @Autowired
+    private OutFeeBiz outFeeBiz;
+
+
+    /**
+     *
+     */
+    @Scheduled(cron = "0/10 * * * * ? ")
+    public void timerUp() {
+        logger.info("==================== 计算关税开始 ====================");
+        String begDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
+        logger.info("--- 任务开始时间: {}", begDateTime);
+        outFeeBiz.task();
+
+
+        String endDateTime = LocalDateTimeUtils.formatNow(LocalDateTimeUtils.DATA_TIME_HYPHEN);
+        logger.info("--- 任务结束时间: {}", endDateTime);
+        logger.info("==================== 计算关税结束 ====================");
+
+    }
+
+
+}

src/main/java/com/emato/cus/supervise/service/cus/CusAcqGoodsSeatService06.java

@@ -17,4 +17,25 @@ public interface CusAcqGoodsSeatService06 {
      * @return
      */
     int addCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list);
+
+    /**
+     * 查询现有库位货物信息
+     * @param list
+     * @return
+     */
+    List<CusAcqGoodsSeat06> listCusAcqGoodsSeat(List<CusAcqGoodsSeat06> list);
+
+    /**
+     * 更新库位货物信息
+     * @param list
+     * @return
+     */
+    int updateCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list);
+
+    /**
+     * 删除库位货物信息
+     * @param list
+     * @return
+     */
+    int deleteCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list);
 }

src/main/java/com/emato/cus/supervise/service/cus/impl/CusAcqGoodsMoveSeatServiceImpl06.java

@@ -27,4 +27,21 @@ public class CusAcqGoodsMoveSeatServiceImpl06 implements CusAcqGoodsSeatService0
     public int addCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list) {
         return cusAcqGoodsSeatMapper06.addCusAcqGoodsSeat06(list);
     }
+
+    @Override
+    public List<CusAcqGoodsSeat06> listCusAcqGoodsSeat(List<CusAcqGoodsSeat06> list) {
+        return cusAcqGoodsSeatMapper06.listCusAcqGoodsSeat(list);
+    }
+
+    @Override
+    @Transactional(value ="secondTransactionManager")
+    public int updateCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list) {
+        return cusAcqGoodsSeatMapper06.updateCusAcqGoodsSeat06(list);
+    }
+
+    @Override
+    @Transactional(value ="secondTransactionManager")
+    public int deleteCusAcqGoodsSeat06(List<CusAcqGoodsSeat06> list) {
+        return cusAcqGoodsSeatMapper06.deleteCusAcqGoodsSeat06(list);
+    }
 }

src/main/resources/application-dev.yml

@@ -1,11 +1,77 @@
+#---------- Spring Boot 项目 ----------#
 
-# 当前环境
+# 服务配置
+server:
+  address: 127.0.0.1
+  port: 8081
+
+# 使用环境
 spring:
   profiles: dev
 
+  aop:
+    proxy-target-class: true
 
+  # 数据源
+  datasource:
+    primary:
+      # 数据源zaxxer HikariCP 读取通天晓数据库
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: org.mariadb.jdbc.Driver
+      # url: jdbc:sqlserver://120.24.12.161:60001;DatabaseName=qhwms
+      url: jdbc:mysql://127.0.0.1:3306/wms_test?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: root
+      password: root
+      # hikari连接池配置
+      hikari:
+        readOnly: true
+        connectionTimeout: 10000
+        validationTimeout: 5000
+        idleTimeout: 600000
+        maxLifetime: 1200000
+        maximumPoolSize: 3
+        minimumIdle: 3
+    second:
+      # 数据源zaxxer HikariCP 写入数据库
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: org.mariadb.jdbc.Driver
+      url: jdbc:mysql://127.0.0.1:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: root
+      password: root
+      # hikari连接池配置
+      hikari:
+        connectionTimeout: 10000
+        validationTimeout: 5000
+        idleTimeout: 600000
+        maxLifetime: 1200000
+        maximumPoolSize: 10
+        minimumIdle: 3
+    third:
+          # 数据源zaxxer HikariCP 读取oms
+          type: com.zaxxer.hikari.HikariDataSource
+          driver-class-name: org.mariadb.jdbc.Driver
+          url: jdbc:mysql://120.76.84.45:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+          username: ceshi
+          password: abc-123
+          # hikari连接池配置
+          hikari:
+            connectionTimeout: 10000
+            validationTimeout: 5000
+            idleTimeout: 600000
+            maxLifetime: 1200000
+            maximumPoolSize: 10
+            minimumIdle: 3
 
 
 
-
-
+# mybatis config 多数据源
+mybatis:
+  primary:
+      config-location: classpath:mybatis/mybatis-config.xml
+      type-aliases-package: com.emato.cus.supervise.domain
+  second:
+      config-location: classpath:mybatis/mybatis-config-cus.xml
+      type-aliases-package: com.emato.cus.supervise.domainCus
+  third:
+      config-location: classpath:mybatis/mybatis-config-oms.xml
+      type-aliases-package: com.emato.cus.supervise.domainOms

src/main/resources/application-test.yml

@@ -0,0 +1,75 @@
+#---------- Spring Boot 项目 ----------#
+# 服务配置
+server:
+  address: 127.0.0.1
+  port: 6666
+
+# 使用环境
+spring:
+  profiles: test
+
+  aop:
+    proxy-target-class: true
+
+  # 数据源
+  datasource:
+    primary:
+      # 数据源zaxxer HikariCP 读取通天晓数据库
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: org.mariadb.jdbc.Driver
+      url: jdbc:mysql://120.24.12.161:60002/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: cout_qw
+      password: OqiIQ#p3
+      # hikari连接池配置
+      hikari:
+        readOnly: true
+        connectionTimeout: 10000
+        validationTimeout: 5000
+        idleTimeout: 600000
+        maxLifetime: 1200000
+        maximumPoolSize: 3
+        minimumIdle: 3
+    second:
+      # 数据源zaxxer HikariCP 写入数据库
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: org.mariadb.jdbc.Driver
+      url: jdbc:mysql://120.76.84.45:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: ceshi
+      password: abc-123
+      # hikari连接池配置
+      hikari:
+        connectionTimeout: 10000
+        validationTimeout: 5000
+        idleTimeout: 600000
+        maxLifetime: 1200000
+        maximumPoolSize: 10
+        minimumIdle: 3
+    third:
+          # 数据源zaxxer HikariCP 读取oms
+          type: com.zaxxer.hikari.HikariDataSource
+          driver-class-name: org.mariadb.jdbc.Driver
+          url: jdbc:mysql://120.24.12.161:60002/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+          username: out_qhm
+          password: QhpC7op3
+          # hikari连接池配置
+          hikari:
+            connectionTimeout: 10000
+            validationTimeout: 5000
+            idleTimeout: 600000
+            maxLifetime: 1200000
+            maximumPoolSize: 10
+            minimumIdle: 3
+
+
+
+# mybatis config 多数据源
+mybatis:
+  primary:
+      config-location: classpath:mybatis/mybatis-config.xml
+      type-aliases-package: com.emato.cus.supervise.domain
+  second:
+      config-location: classpath:mybatis/mybatis-config-cus.xml
+      type-aliases-package: com.emato.cus.supervise.domainCus
+  third:
+      config-location: classpath:mybatis/mybatis-config-oms.xml
+      type-aliases-package: com.emato.cus.supervise.domainOms

src/main/resources/application.yml

@@ -9,7 +9,6 @@ app:
 # 服务配置
 server:
   address: 172.18.0.193
-#  address: 127.0.0.1
   port: 6666
 
 
@@ -23,7 +22,7 @@ ds:
 # 使用环境
 spring:
   profiles:
-    active:
+    active: dev
   aop:
     proxy-target-class: true
 
@@ -33,13 +32,12 @@ spring:
       # 数据源zaxxer HikariCP 读取通天晓数据库
       type: com.zaxxer.hikari.HikariDataSource
       driver-class-name: org.mariadb.jdbc.Driver
-      # url: jdbc:sqlserver://120.24.12.161:60001;DatabaseName=qhwms
-      # url: jdbc:mysql://120.24.12.161:60002/wms_test?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-      # username: qhdsrds
-      # password: Cb!uk3vXPW
-      url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-      username: qhdsf_wms
-      password: g$2tX98$tX
+      url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: cout_qw
+      password: 1#DR1yZCN$
+#      url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#      username: qhdsf_wms
+#      password: g$2tX98$tX
       # hikari连接池配置
       hikari:
         readOnly: true
@@ -53,9 +51,6 @@ spring:
       # 数据源zaxxer HikariCP 写入数据库
       type: com.zaxxer.hikari.HikariDataSource
       driver-class-name: org.mariadb.jdbc.Driver
-#      url: jdbc:mysql://120.76.84.45:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#      username: tuser
-#      password: Qq!123
       url: jdbc:mysql://183.3.221.144:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
       username: wms_admin
       password: DsuBkL2w$q
@@ -71,12 +66,12 @@ spring:
           # 数据源zaxxer HikariCP 读取oms
           type: com.zaxxer.hikari.HikariDataSource
           driver-class-name: org.mariadb.jdbc.Driver
-#          url: jdbc:mysql://120.24.12.161:60002/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#          username: out_qhm
-#          password: r%4PEusOn&
-          url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-          username: qhdsi_oms
-          password: ZuQhCA#px3
+          url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+          username: out_qhm
+          password: r%4PEusOn&
+#          url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#          username: qhdsi_oms
+#          password: ZuQhCA#px3
           # hikari连接池配置
           hikari:
             connectionTimeout: 10000

src/main/resources/mybatis/mapper/wms-acq-goods-move.xml

@@ -4,8 +4,7 @@
 <mapper namespace="com.emato.cus.supervise.mapper.WmsAcqGoodsMoveMapper">
 
     <!-- 企业货物在仓库库的移动查询： 上架查询 -->
-    <select id="getWmsAcqGoodsMoveUp" parameterType="java.util.Map"
-            resultType="com.emato.cus.supervise.domain.WmsAcqGoodsMove">
+    <select id="getWmsAcqGoodsMoveUp" parameterType="java.util.Map" resultType="com.emato.cus.supervise.domain.WmsAcqGoodsMove">
 		SELECT
 		td.taskType AS taskType,
 		td.created AS created,
@@ -19,16 +18,17 @@
 		i.unitDesc AS gUnit,
 		td.totalqty AS gQty,
 		CONCAT(i.itemSize,'-',i.itemColor,'-',i.itemStyle) as goodsModel
-		FROM
-		task_detail td
+		FROM task_detail td
 		LEFT JOIN item i on td.itemcode = i.CODE
+		LEFT JOIN location l1 ON td.toLoc = l1.CODE
+		LEFT JOIN location l2 ON td.fromLoc = l2.CODE
 		<where>
+			1 = 1
+			and (l1.zoneCode in ('A区', 'B区', 'C区', 'GQ区', 'F区', 'P区') or l2.zoneCode in ('A区', 'B区', 'C区', 'GQ区', 'F区', 'P区'))
 			<if test="thisTime != null">
-				td.lastUpdated &gt;= #{thisTime}
+				and td.lastUpdated &gt;= #{thisTime}
 			</if>
 		</where>
     </select>
 
-
-
 </mapper>

src/main/resources/mybatis/mapper/wms-acq-goods-on-seat.xml

@@ -4,33 +4,35 @@
 <mapper namespace="com.emato.cus.supervise.mapper.WmsAcqGoodsSeatMapper">
 
     <!-- 库位上的货品信息 -->
-    <select id="getWmsAcqGoodsSeat" parameterType="java.util.Map"
-            resultType="com.emato.cus.supervise.domain.WmsAcqGoodsOnSeat">
-        SELECT
-        li.companyCode AS merchSn,
-        li.locationCode AS seatNo,
-        li.itemName AS goodsName,
-        li.itemCode AS codeTs,
-        li.itemCode AS skuNo,
-        li.itemCode AS goodsId,
-        i.unitDesc AS gUnit,
-        li.onHandQty AS gQty,
-        li.warehouseCode AS storeCode,
-        CONCAT(
-        i.itemSize,
-        '-',
-        i.itemColor,
-        '-',
-        i.itemStyle
-        ) AS goodsModel
-        FROM
-        location_inventory li
-        LEFT JOIN item i ON li.itemCode = i. CODE
+    <select id="getWmsAcqGoodsSeat" parameterType="java.util.Map" resultType="com.emato.cus.supervise.domain.WmsAcqGoodsOnSeat">
+        SELECT * FROM
+        (SELECT
+          th.companyCode AS merchSn,
+          th.locationCode AS seatNo,
+          th.itemName AS goodsName,
+          th.itemCode AS codeTs,
+          th.itemCode AS skuNo,
+          th.itemCode AS goodsId,
+          i.unitDesc AS gUnit,
+          th.afterOnHandQty AS gQty,
+          th.warehouseCode AS storeCode,
+          CONCAT( i.itemSize, '-', i.itemColor, '-', i.itemStyle ) AS goodsModel
+        FROM transaction_history th
+        LEFT JOIN ( SELECT itemCode, locationCode, SUM( onHandQty ) AS qty FROM location_inventory GROUP BY itemCode, locationCode ) AS li
+          ON th.itemCode = li.itemCode AND th.locationCode = li.locationCode
+        LEFT JOIN item i ON th.itemCode = i.CODE
         <where>
-            <if test="thisTime != null">
-                li.lastUpdated &gt;= #{thisTime}
-            </if>
+           1 = 1
+           and th.zone in ('A区', 'B区', 'C区', 'GQ区', 'F区', 'P区')
+           and (th.afterOnHandQty = li.qty or th.afterOnHandQty = 0)
+           and li.qty is not null
+           <if test="thisTime != null">
+              and th.created &gt;= #{thisTime}
+           </if>
         </where>
+        ORDER BY th.created DESC
+        ) AS temp
+        GROUP BY skuNo, seatNo
     </select>
 
 

src/main/resources/mybatis/mapper/wms-acq-inventory-info.xml

@@ -8,22 +8,23 @@
     <select id="getWmsAcqInventoryInfo" parameterType="java.util.Map"
             resultType="com.emato.cus.supervise.domain.WmsAcqInventoryInfo">
 		SELECT
-			li.companyCode AS merchSn,
-			li.itemName AS goodsName,
-			li.itemCode AS codeTs,
-			i.unitDesc AS gUnit,
-			SUM(li.onHandQty) AS gQty,
-			CONCAT(i.itemSize,'-',i.itemColor,'-',i.itemStyle) as goodsModel
-		FROM
-			location_inventory li
-		LEFT JOIN item i ON li.itemCode = i. CODE
+		li.companyCode AS merchSn,
+		li.itemName AS goodsName,
+		li.itemCode AS codeTs,
+		i.unitDesc AS gUnit,
+		SUM(li.onHandQty) AS gQty,
+		CONCAT(i.itemSize,'-',i.itemColor,'-',i.itemStyle) as goodsModel
+		FROM location_inventory li
+		LEFT JOIN item i ON li.itemCode = i.CODE
+		LEFT JOIN location l ON li.locationCode = l.CODE
 		<where>
+			1 = 1
+			and l.zoneCode in ('A区', 'B区', 'C区', 'GQ区', 'F区', 'P区')
 			<if test="thisTime != null">
-				li.lastUpdated &gt;= #{thisTime}
+				and li.lastUpdated &gt;= #{thisTime}
 			</if>
 		</where>
-		GROUP BY
-		li.itemCode
+		GROUP BY li.itemCode
     </select>
 
 

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

@@ -4,38 +4,32 @@
 <mapper namespace="com.emato.cus.supervise.mapper.WmsAcqShelfLoadMapper">
 
     <!-- 企业货物上下架信息： 上架查询 -->
-    <select id="getWmsAcqShelfLoadUp" parameterType="java.util.Map"
-            resultType="com.emato.cus.supervise.domain.WmsAcqShelfLoad">
-			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 id="getWmsAcqShelfLoadUp" parameterType="java.util.Map" resultType="com.emato.cus.supervise.domain.WmsAcqShelfLoad">
+		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
+		LEFT JOIN location l ON rc.toLocation = l.CODE
 		<where>
+			1 = 1
+			and l.zoneCode in ('A区', 'B区', 'C区', 'GQ区', 'F区', 'P区')
 			<if test="thisTime != null">
-				rc.lastUpdated &gt;= #{thisTime}
+				and rc.lastUpdated &gt;= #{thisTime}
 			</if>
 		</where>
     </select>
 
 	<!-- 企业货物上下架信息： 下架查询 -->
-	<select id="getWmsAcqShelfLoadDown" parameterType="java.util.Map"
-			resultType="com.emato.cus.supervise.domain.WmsAcqShelfLoad">
+	<select id="getWmsAcqShelfLoadDown" parameterType="java.util.Map" resultType="com.emato.cus.supervise.domain.WmsAcqShelfLoad">
 		SELECT
 		i.`name` AS goodsName,
 		itemCode AS codeTs,
@@ -43,22 +37,18 @@
 		itemCode AS goodsId,
 		quantity AS gQty,
 		i.unitDesc AS gUnit,
-		CONCAT(
-		i.itemSize,
-		'-',
-		i.itemColor,
-		'-',
-		i.itemStyle
-		) AS goodsModel,
+		CONCAT(i.itemSize, '-', i.itemColor, '-', i.itemStyle) AS goodsModel,
 		originalPickLoc AS seatNo,
 		scd.created AS shelfLoadTime,
 		'E' AS shelfLoadType
-		FROM
-		Shipping_container_detail scd
+		FROM Shipping_container_detail scd
 		LEFT JOIN item i ON scd.itemCode = i.`code`
+		LEFT JOIN location l ON scd.originalPickLoc = l.CODE
 		<where>
+			1 = 1
+			and l.zoneCode in ('A区', 'B区', 'C区', 'GQ区', 'F区', 'P区')
 			<if test="thisTime != null">
-				scd.lastUpdated &gt;= #{thisTime}
+				and scd.lastUpdated &gt;= #{thisTime}
 			</if>
 		</where>
 	</select>

src/main/resources/mybatis/mapperCus/cus-acq-goods-seat.xml

@@ -37,6 +37,17 @@
         <result property="modTime" column="mod_time"/>
     </resultMap>
 
+    <select id="listCusAcqGoodsSeat" resultMap="cusAcqGoodsSeat" parameterType="List">
+        select * from acq_goods_on_seat
+        <where>
+            <foreach collection="list" item="i" index="idx" open="(" separator="or" close=")">
+                <if test="i.seatNo !=null and i.seatNo !=''">
+                    sku_no=#{i.skuNo} and seat_no=#{i.seatNo}
+                </if>
+            </foreach>
+        </where>
+    </select>
+
     <!-- 库位货物数据 -->
     <insert id="addCusAcqGoodsSeat06" parameterType="List">
         INSERT INTO acq_goods_on_seat (
@@ -62,4 +73,146 @@
         </foreach>
     </insert>
 
+    <update id="updateCusAcqGoodsSeat06" parameterType="List">
+        UPDATE acq_goods_on_seat
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="goods_name =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.goodsName !=null and i.goodsName !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.goodsName, jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="code_ts =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.codeTs !=null and i.codeTs !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.codeTs, jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="form_no_dec =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.formNoDec !=null and i.formNoDec !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.formNoDec, jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="form_no =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.formNo !=null and i.formNo !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.formNo, jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="g_unit =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.gUnit !=null and i.gUnit !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.gUnit, jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="g_qyt =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.gQty !=null and i.gQty !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.gQty, jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="legal_unit =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.legalUnit !=null and i.legalUnit !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.legalUnit, jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="legal_qyt =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.legalQty !=null and i.legalQty !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.legalQty, jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="goods_model =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.goodsModel !=null and i.goodsModel !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.goodsModel, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="owner_code =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.ownerCode !=null and i.ownerCode !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.ownerCode, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="owner_name =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.ownerName !=null and i.ownerName !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.ownerName, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="store_company_name =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.storeCompanyName !=null and i.storeCompanyName !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.storeCompanyName, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="store_usc_code =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.storeUscCode !=null and i.storeUscCode !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.storeUscCode, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="store_customs_code =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.storeCustomsCode !=null and i.storeCustomsCode !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.storeCustomsCode, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="store_code =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.storeCode !=null and i.storeCode !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.storeCode, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="moder_sn =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.moderSn !=null and i.moderSn !=''">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.moderSn, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="mod_time =case" suffix="end,">
+                <foreach collection="list" item="i" index="idx">
+                    <if test="i.modTime !=null">
+                        when sku_no=#{i.skuNo} and seat_no=#{i.seatNo} then #{i.modTime, jdbcType=DATE}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        <where>
+            <if test="list != null and list.size()>0">
+                <foreach collection="list" item="i" index="index" open="(" separator="or" close=")">
+                    sku_no=#{i.skuNo} and seat_no=#{i.seatNo}
+                </foreach>
+            </if>
+        </where>
+    </update>
+
+    <delete id="deleteCusAcqGoodsSeat06" parameterType="List">
+        DELETE FROM acq_goods_on_seat
+        <where>
+            <if test="list != null and list.size()>0">
+                <foreach collection="list" item="i" index="index" open="id IN (" separator="," close=")">
+                    #{i.id}
+                </foreach>
+            </if>
+        </where>
+    </delete>
 </mapper>

src/main/resources/mybatis/mapperCus/cus-acq-inventory-info.xml

@@ -35,9 +35,9 @@
         select * from acq_inventory_info
         <where>
             <if test="list != null and list.size()>0">
-                sku IN
-                <foreach collection="list" item="i" index="idx" open="(" separator="," close=")">
-                    #{i.sku}
+                sku_no IN
+                <foreach collection="list" item="sku" index="idx" open="(" separator="," close=")">
+                    #{sku}
                 </foreach>
             </if>
         </where>

src/main/resources/mybatis/mapperOms/oms-product-info.xml

@@ -15,7 +15,8 @@
 		pr.sku AS skuNo,
 		t1.local_ems_no AS localEmsNo
 		FROM
-		pd_product_record pr left outer join sys_cus_goods_code gc on pr.cus_goods_code = gc.cus_goods_code
+		pd_product_record pr
+		left outer join sys_cus_goods_code gc on pr.cus_goods_code = gc.cus_goods_code
 		left outer join merchant_record t1 on pr.merch_sn=t1.merch_sn
 		where t1.local_ems_no is not null AND pr.sku IN
 		<foreach collection="list" item="sku" index="index"

src/sql/wms-data.sql

@@ -11,7 +11,7 @@ SELECT * from (
            t.totalQty AS gQty, t1.qty1*t.totalQty AS legalQty, t1.unit1 AS legalUnitName, t11.codeValue AS legalUnit,  t1.customsDeclaredElements AS goodsModel,
       t.shopId, t3.compayName AS ownerName, t3.customsCertNo AS ownerCode,
       '440301111758322' AS storeUscCode,  'I440366000315001' AS localEmsNo,
-      '深圳前海电商供应链管理有限公司' AS storeCompanyName, '319489717' AS storeUseCode,
+      '前海电商（深圳）供应链集团有限公司' AS storeCompanyName, '319489717' AS storeUseCode,
       '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode, t.totQtyChgTime
     from ShopStock t
       LEFT OUTER JOIN Product t1 ON t.sku=t1.sku
@@ -37,7 +37,7 @@ SELECT * from (
          t.nonDefectQty AS gQty, t1.qty1*t.nonDefectQty AS legalQty, t1.unit1 AS legalUnitName, t11.codeValue AS legalUnit, t1.customsDeclaredElements AS goodsModel,
          t4.label AS seatNo, 'I' AS shelfLoadType, t.warehousedTime AS shelfLoadTime,
          '440301111758322' AS storeUscCode, 'I440366000315001' AS localEmsNo,
-         '深圳前海电商供应链管理有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode
+         '前海电商（深圳）供应链集团有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode
     FROM AsnItem t
       LEFT OUTER JOIN Product t1 ON t.sku=t1.sku
       LEFT OUTER JOIN ProductCategory t2 ON t1.productCategoryId=t2.id
@@ -61,7 +61,7 @@ SELECT * from (
            t.withdrawQty AS gQty, t1.qty1*t.withdrawQty AS legalQty, t1.unit1 AS legalUnitName, t11.codeValue AS legalUnit, t1.customsDeclaredElements AS goodsModel,
            t4.label AS seatNo, 'E' AS shelfLoadType, t.created AS shelfLoadTime,
            '440301111758322' AS storeUscCode, 'I440366000315001' AS localEmsNo,
-           '深圳前海电商供应链管理有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode
+           '前海电商（深圳）供应链集团有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode
     FROM StockWithdrawItem t
       LEFT OUTER JOIN Product t1 ON t.sku=t1.sku
       LEFT OUTER JOIN ProductCategory t2 ON t1.productCategoryId=t2.id
@@ -83,7 +83,7 @@ SELECT * from (
                  t.qty AS gQty, t1.qty1*t.qty AS legalQty, t1.unit1 AS legalUnitName, t11.codeValue AS legalUnit, t1.customsDeclaredElements AS goodsModel,
                  t4.label AS seatNo, 'E' AS shelfLoadType, t.createTime AS shelfLoadTime,
                  '440301111758322' AS storeUscCode,  'I440366000315001' AS localEmsNo,
-                 '深圳前海电商供应链管理有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode
+                 '前海电商（深圳）供应链集团有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode
     FROM WarehousingEntry_shipment t
       LEFT OUTER JOIN Product t1 ON t.sku=t1.sku
       LEFT OUTER JOIN ProductCategory t2 ON t1.productCategoryId=t2.id
@@ -110,7 +110,7 @@ SELECT * from (
          t1.shortName AS goodsName, t2.customsProductCode AS codeTs, t.sku AS skuNo, t.sku AS goodsId, t1.unit AS gUnitName, t10.codeValue AS gUnit, t.qty AS gQty,
          t1.qty1*t.qty AS legalQty, t1.unit1 AS legalUnitName, t11.codeValue AS legalUnit, t1.customsDeclaredElements AS goodsModel,
          '440301111758322' AS storeUscCode, 'I440366000315001' AS localEmsNo,
-         '深圳前海电商供应链管理有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode,
+         '前海电商（深圳）供应链集团有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode,
     transferTime
   FROM StockSlotTransfer t
     LEFT OUTER JOIN Product t1 ON t.sku=t1.sku
@@ -143,7 +143,7 @@ SELECT * from (
          (t.availableQty + t.frozenQty) AS gQty, t1.qty1*(t.availableQty + t.frozenQty) AS legalQty, t1.unit1 AS legalUnitName, t11.codeValue AS legalUnit, t1.customsDeclaredElements AS goodsModel,
     t.shopId, t3.compayName AS ownerName, t3.customsCertNo AS ownerCode,
     '440301111758322' AS storeUscCode, 'I440366000315001' AS localEmsNo,
-    '深圳前海电商供应链管理有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode,
+    '前海电商（深圳）供应链集团有限公司' AS storeCompanyName, '319489717' AS storeUseCode, '4403660003' AS storeCustomsCode, '534931948971720171102000281725' AS storeCode,
     t.avaQtyChgTime
   FROM WarehousingEntry t
     LEFT OUTER JOIN Product t1 ON t.sku=t1.sku