From fd8c3e9c4c7cfcade83b91a4d6958ed9a51da86e Mon Sep 17 00:00:00 2001 From: "guozhang.luo" <1972685455@qq.com> Date: Fri, 6 May 2022 19:50:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=A5=E6=96=99=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WLT封装回货、Sensor封装回货ENG验证修改 --- .../main/java/com/newbiest/gc/service/impl/GcServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 index 5c575fd9..584a6223 100644 --- 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 @@ -5992,12 +5992,14 @@ public List packReturnSetWaferSource(String importType, List materialLotUnit @Override public void mesMaterialLotUnitUnBindWorkorderAndSaveHis(List materialLotUnitList, String transId) throws ClientException { try{ + log.info("unbindWorkorder materialLotUnitList is " + materialLotUnitList); List scmReportMLotList = Lists.newArrayList(); Map> materialLotUnitMap = materialLotUnitList.stream().collect(Collectors.groupingBy(MaterialLotUnit:: getMaterialLotId)); for(MaterialLotUnit materialLotUnit : materialLotUnitList){ From 9bb514e093230988d38632295d5042434ba381b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=8B001H?= <73891005+Yoko001H@users.noreply.github.com> Date: Mon, 6 Jun 2022 17:01:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=9D=E7=A8=8E=E4=BB=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E2=80=9C=E5=8F=96=E6=B6=88=E5=A4=87=E8=B4=A7=E2=80=9D?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 保税仓添加“取消备货”功能 --- ...rehouseUnReservedMaterialLot_nb_table.yaml | 17 ++++++++++++++++ .../db/changelog/db.changelog-gc.yaml | 3 +++ ...useUnReservedMaterialLot.nb_authority.yaml | 20 +++++++++++++++++++ .../db/changelog/db.changelog-mms.yaml | 3 +++ 4 files changed, 43 insertions(+) create mode 100644 newbiest-gc/src/main/resources/db/changelog/db.changelog-add.GCBondedWarehouseUnReservedMaterialLot_nb_table.yaml create mode 100644 newbiest-mm/src/main/resources/db/changelog/db.changelog-add.BondedWarehouseUnReservedMaterialLot.nb_authority.yaml diff --git a/newbiest-gc/src/main/resources/db/changelog/db.changelog-add.GCBondedWarehouseUnReservedMaterialLot_nb_table.yaml b/newbiest-gc/src/main/resources/db/changelog/db.changelog-add.GCBondedWarehouseUnReservedMaterialLot_nb_table.yaml new file mode 100644 index 00000000..0f856356 --- /dev/null +++ b/newbiest-gc/src/main/resources/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 \ No newline at end of file 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 index 36c04b99..d1c5e25f 100644 --- 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/newbiest-mm/src/main/resources/db/changelog/db.changelog-add.BondedWarehouseUnReservedMaterialLot.nb_authority.yaml b/newbiest-mm/src/main/resources/db/changelog/db.changelog-add.BondedWarehouseUnReservedMaterialLot.nb_authority.yaml new file mode 100644 index 00000000..4b4e55a9 --- /dev/null +++ b/newbiest-mm/src/main/resources/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 \ No newline at end of file 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 index e0fcdc03..2e0371b3 100644 --- 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