Merge pull request #66 from guoxunbo/gc_wms_v2

Gc wms v2
guoxunbo · Jun 7, 2022 · 7e13ecb · 7e13ecb
2 parents 35429a8 + 10c462a
commit 7e13ecb
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 0 deletions.
diff --git a/newbiest-gc/src/main/java/com/newbiest/gc/service/impl/GcServiceImpl.java b/newbiest-gc/src/main/java/com/newbiest/gc/service/impl/GcServiceImpl.java
@@ -10460,6 +10460,7 @@ public void reconMaterialLotUnitAndSaveHis(List<MaterialLotUnit> materialLotUnit
     @Override
     public void mesMaterialLotUnitUnBindWorkorderAndSaveHis(List<MaterialLotUnit> materialLotUnitList, String transId) throws ClientException {
         try{
+            log.info("unbindWorkorder materialLotUnitList is " + materialLotUnitList);
             List<MaterialLot> scmReportMLotList = Lists.newArrayList();
             Map<String, List<MaterialLotUnit>> materialLotUnitMap = materialLotUnitList.stream().collect(Collectors.groupingBy(MaterialLotUnit:: getMaterialLotId));
             for(MaterialLotUnit materialLotUnit : materialLotUnitList){

diff --git a/...ources/db/changelog/db.changelog-add.GCBondedWarehouseUnReservedMaterialLot_nb_table.yaml b/...ources/db/changelog/db.changelog-add.GCBondedWarehouseUnReservedMaterialLot_nb_table.yaml
@@ -0,0 +1,17 @@
+databaseChangeLog:
+  - changeSet:
+      id: add_BondedWarehouseUnReservedMaterialLot_to_NB_TABLE
+      author: Youqing Huang
+      comment: add BondedWarehouseUnReservedMaterialLot to nb_table
+      dbms: oracle
+      changes:
+        - createOnLineTable:
+            skipFlag: N
+            nbTable:
+              name: BondedWarehouseUnReservedMLot
+              description: 保税仓库 取消备货
+              tableName: MMS_MATERIAL_LOT
+              modelName: MaterialLot
+              modelClass: com.newbiest.mms.model.MaterialLot
+              labelZh: 取消备货
+              label: UnReservedMaterialLot
diff --git a/newbiest-gc/src/main/resources/db/changelog/db.changelog-gc.yaml b/newbiest-gc/src/main/resources/db/changelog/db.changelog-gc.yaml
@@ -962,3 +962,6 @@ databaseChangeLog:
   - include:
       file: db.changelog-add.GCBondedWarehouseMLotsOtherShipReserved_nb_table.yaml
       relativeToChangelogFile: true
+  - include:
+      file: db.changelog-add.GCBondedWarehouseUnReservedMaterialLot_nb_table.yaml
+      relativeToChangelogFile: true
diff --git a/...rces/db/changelog/db.changelog-add.BondedWarehouseUnReservedMaterialLot.nb_authority.yaml b/...rces/db/changelog/db.changelog-add.BondedWarehouseUnReservedMaterialLot.nb_authority.yaml
@@ -0,0 +1,20 @@
+databaseChangeLog:
+  - changeSet:
+      id: add_BondedWarehouseUnReservedMaterialLotManager_to_NB_AUTHORITY
+      author: Youqing Huang
+      comment: add BondedWarehouseUnReservedMaterialLotManager to nb_authority
+      dbms: oracle
+      changes:
+        - createAuthority:
+            skipFlag: N
+            authority:
+              name: BondedWarehouseUnReservedMLot
+              description: 保税仓库 取消备货
+              tableName: BondedWarehouseUnReservedMLot
+              mobileFlag: N
+              url: /BondedWarehouse/UnReservedMLot
+              parentRrn: 2021
+              seqNo: 160
+              image: icon-wuliao
+              labelZh: 取消备货
+              labelEn: UnReservedMaterialLot
diff --git a/newbiest-mm/src/main/resources/db/changelog/db.changelog-mms.yaml b/newbiest-mm/src/main/resources/db/changelog/db.changelog-mms.yaml
@@ -971,3 +971,6 @@ databaseChangeLog:
   - include:
       file: db.changelog-add.BondedWarehouseMLotsOtherShipReserved.nb_authority.yaml
       relativeToChangelogFile: true
+  - include:
+      file: db.changelog-add.BondedWarehouseUnReservedMaterialLot.nb_authority.yaml
+      relativeToChangelogFile: true