From d56cc9facb4be5632281cc78de37b8fbf5fc86fb Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 1 Apr 2025 15:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BB=B4=E4=BA=BA=E5=91=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + base-buildpackage/pom.xml | 12 +++++ .../ZjMaterielSynchronizationEventEntity.java | 18 +++++++ ...terielSynchronizationEventServiceImpl.java | 12 +++-- .../src/main/resources/application-zhouju.yml | 53 ++++++++++++++++++ .../main/resources/application-zhoujutest.yml | 53 ++++++++++++++++++ .../test/java/com/hzya/frame/temButtom.java | 2 +- .../inventory/entity/InventoryExtEntity.xml | 14 +++-- pom.xml | 54 +++++++++---------- 9 files changed, 183 insertions(+), 36 deletions(-) create mode 100644 base-buildpackage/src/main/resources/application-zhouju.yml create mode 100644 base-buildpackage/src/main/resources/application-zhoujutest.yml diff --git a/.gitignore b/.gitignore index b252f4db..8eb01331 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk ./idea/ +/idea/ /buildpackage/src/main/resources/banner.txt /webapp/target/ /service/target/ diff --git a/base-buildpackage/pom.xml b/base-buildpackage/pom.xml index bb6bacf6..89785ed2 100644 --- a/base-buildpackage/pom.xml +++ b/base-buildpackage/pom.xml @@ -55,6 +55,18 @@ xel + + zhouju + + zhouju + + + + zhoujutest + + zhoujutest + + kangarooDataCenterV3 diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java index b3c44175..988e704a 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java @@ -67,6 +67,8 @@ public class ZjMaterielSynchronizationEventEntity extends BaseEntity { private String field0047code;//物料类别 private String field0048;//计量单位 private String field0048code;//计量单位 + private String accName;// + private String caccId;// public String getFormmain_id() { @@ -500,5 +502,21 @@ public class ZjMaterielSynchronizationEventEntity extends BaseEntity { public void setField0043code(String field0043code) { this.field0043code = field0043code; } + + public String getAccName() { + return accName; + } + + public void setAccName(String accName) { + this.accName = accName; + } + + public String getCaccId() { + return caccId; + } + + public void setCaccId(String caccId) { + this.caccId = caccId; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java index 1b183c89..2b677270 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java @@ -86,7 +86,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService + + + + + + + + + + cInvCode, cidefine1, @@ -23,10 +33,8 @@ cidefine3, cidefine4, cidefine5, - cidefine6, - cidefine7 + cidefine6 -