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

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/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