Merge branch 'master' of csk/cus-wms-supervise2.0 into master

build.gradle

@@ -1,28 +1,22 @@
 // Gradle plugin
 plugins {
-	id 'org.springframework.boot' version '2.2.5.RELEASE'
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'org.springframework.boot' version '2.5.2' apply(false)
+	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply(false)
+	id 'java'
+	id 'war'
 }
 
-
-apply plugin: 'java'
-apply plugin: 'war'
-
-apply plugin: "org.springframework.boot"
-//提供类似Maven dependencyManagement依赖管理功能
+apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
-
-group = 'com.emato'
-version = '1.0.0'
-sourceCompatibility = 1.8
-
 war {
 	archiveBaseName = 'cus-wms-supervise2.0'
 }
 
 // 解决中文乱码
 tasks.withType(JavaCompile) {
+	sourceCompatibility = 1.8
+	targetCompatibility = 1.8
 	options.encoding = "UTF-8"
 }
 

src/main/java/com/emato/cus/supervise/biz/EmsClassConversion.java

@@ -15,10 +15,13 @@ public class EmsClassConversion {
      */
     public static String convertBySeatNo(String seatNo) {
         // 如下判断必须与WMS系统的库位编码命名结合
-        if (seatNo.startsWith("ZS")) {
+        if (seatNo.toUpperCase().startsWith("ZS")) {
             //展示账册分类
             return Dict.emsClassTypeMap.get("ZS");
-        } else if (seatNo.startsWith("F")) {
+        } else if (seatNo.toUpperCase().startsWith("CWMD")) {
+            // 2024-02-02 海关业务变化，导致CW使用新的账册出区，WMS库位启用新的前缀标识 CWMD （CW门店的缩写）
+            return Dict.emsClassTypeMap.get("CWMD");
+        } else if (seatNo.toUpperCase().startsWith("F")) {
             // 非保账册分类
             return Dict.emsClassTypeMap.get("F");
         } else {

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

@@ -1,7 +1,6 @@
 package com.emato.cus.supervise.biz.acqInventoryInfo;
 
 import com.emato.cus.supervise.biz.DataConversion;
-import com.emato.cus.supervise.biz.EmsClassConversion;
 import com.emato.cus.supervise.constant.Dict;
 import com.emato.cus.supervise.domain.WmsAcqInventoryInfo;
 import com.emato.cus.supervise.domainCus.CusAcqInventoryInfo03;
@@ -64,7 +63,7 @@ public class AcqInventoryInfoDataConversion implements DataConversion {
                 WmsAcqInventoryInfo wmsAcqInventoryInfo = wmsList.get(i);
 
                 // WMS抓取中已经针对库位转换了账册分类代码，直接使用
-                String emsClassType = wmsAcqInventoryInfo.getEmsClassCode();
+                String emsClassType = wmsAcqInventoryInfo.getEmsClassType();
                 // 拼接商户账册分类
                 String merchEmsType = wmsAcqInventoryInfo.getMerchSn() + "_" + emsClassType;
                 if (!omsMerchInfoMap.containsKey(merchEmsType)) {

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

@@ -42,6 +42,10 @@ public class Dict {
     public static final Map<String, String> emsClassTypeMap = new HashMap<String, String>(){
         {
             put("ZS", "zszc");  // 展示账册分类，zs：展示账册
+
+            // 2024-02-02 海关业务变化，导致CW使用新的账册出区，WMS库位启用新的前缀标识 CWMD （CW门店的缩写）
+            put("CWMD", "bswl");  // CW门店，bsws：保税物流
+
             put("F", "fbwl");   // 非保账册分类，fbwl：非保物流
             put("Others", "kjds");  // 跨境电商账册分类，bswl：保税物流
         }

src/main/java/com/emato/cus/supervise/domain/WmsAcqInventoryInfo.java

@@ -40,7 +40,7 @@ public class WmsAcqInventoryInfo implements Serializable {
     private String moderSn;
     private LocalDateTime modTime;
 
-    private String emsClassCode;
+    private String emsClassType;
 
     public String getSeatNo() {
         return seatNo;
@@ -218,11 +218,11 @@ public class WmsAcqInventoryInfo implements Serializable {
         this.modTime = modTime;
     }
 
-    public String getEmsClassCode() {
-        return emsClassCode;
+    public String getEmsClassType() {
+        return emsClassType;
     }
 
-    public void setEmsClassCode(String emsClassCode) {
-        this.emsClassCode = emsClassCode;
+    public void setEmsClassType(String emsClassType) {
+        this.emsClassType = emsClassType;
     }
 }

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

@@ -9,7 +9,7 @@
             resultType="com.emato.cus.supervise.domain.WmsAcqInventoryInfo">
 
 		SELECT
-			emsClassCode,
+			emsClassType,
 			skuNo,
 			goodsId,
 			SUM(gQty) AS gQty,
@@ -21,8 +21,10 @@
 				 SELECT
 					 (CASE
 						  WHEN (left(a.seatNo, 2) = 'ZS') THEN 'zszc'
+						  WHEN (left(a.seatNo, 4) = 'ZS07') THEN 'zszc'
+						  WHEN (left(a.seatNo, 4) = 'CWMD') THEN 'bswl'
 						  WHEN (left(a.seatNo, 2) = 'F-') THEN 'fbwl'
-						  ELSE 'kjds' END) as emsClassCode,
+						  ELSE 'kjds' END) as emsClassType,
 					 seatNo,
 					 skuNo,
 					 goodsId,

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

@@ -16,7 +16,7 @@
 		t2.cus_ems_no AS cusEmsNo
 		FROM merchant_base t
 		left outer join ems_class_config t2 on t.merch_sn=t2.merch_sn
-		where t2.cus_ems_no is not null and t.merch_sn IN
+		where t2.is_valid = 0 and t2.cus_ems_no is not null and t.merch_sn IN
 		<foreach collection="list" item="merchSn" index="index"
 				 open="(" close=")" separator=",">
 			#{merchSn}