root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:代码合并

Browse Source
This commit is contained in:
zhangzq
2024-06-05 14:54:42 +08:00
parent 7fc66c46a1
commit 25f148279d
16 changed files with 61 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wms_pro/hd/.idea/jarRepositories.xml generated
View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://121.40.234.130:8081/repository/maven-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

21
wms_pro/hd/.idea/misc.xml generated
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FindBugsConfigurable">
<option name="make" value="true" />
<option name="effort" value="default" />
<option name="priority" value="Medium" />
<option name="excludeFilter" value="" />
</component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="OpenJdk1.8" project-jdk-type="JavaSDK" />
<component name="SuppressionsComponent">
<option name="suppComments" value="[]" />
</component>
</project>

249
wms_pro/hd/.idea/sonarlint/issuestore/index.pb generated
View File

@@ -1,249 +0,0 @@
q
Anladmin-system/src/main/java/org/nl/common/anno/Datazhuazhua.java,3/6/363ec6c9460095b38992146a934751ba30bef9af
<EFBFBD>
Ynladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java,a/a/aa9ec186e2a7aa1989de50b7632ac6126cea19a9
<EFBFBD>
_nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java,5/b/5bf8a103b07bcc6e53d76381558cf3ce51acec97
<EFBFBD>
Ynladmin-system/src/main/java/org/nl/wms/system_manage/service/monitor/MonitorService.java,c/0/c0e2ef4c9f0be9eecb402d0138aad7541779c88c
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/system_manage/service/monitor/impl/MonitorServiceImpl.java,5/5/553547bce1b3e1671f6cb30528d51898d41fb948
F
nladmin-system/pom.xml,b/8/b87f4e47fe0f4be8cc67208a35f33f3b272af09f
7
pom.xml,4/4/442292b8a7efeabbe4cc176709b833b1792140ec
<EFBFBD>
jnladmin-system/src/main/java/org/nl/wms/system_manage/service/generator/impl/CodeGenConfigServiceImpl.java,2/d/2d32fa4ba277a66f4515ea7d34297bcfeca20b22
<EFBFBD>
^nladmin-system/src/main/java/org/nl/wms/system_manage/service/generator/dao/CodeGenConfig.java,3/a/3a408b7d961edb8db362ab2025efe90ae43186c9
<EFBFBD>
dnladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java,3/2/327e504df1a8ea8af98fe85d21ec4692cccd130d
<EFBFBD>
_nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleService.java,e/4/e447678e220dc6708fa6d3f2fdf29275c061c85c
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java,f/c/fc51b9e09e27f27eee834adb54557bc93da3ccb4
<EFBFBD>
lnladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java,1/1/11978d8ffa97bb119d9c27e2ba034b73db067e4b
_
/nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/BmSupplierMapper.java,8/5/85dbedfade54927efe168608601c3aefd87bec15
<EFBFBD>
Xnladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/BmSupplier.java,e/4/e4862e0547db5b758eaf94b49e5b6e4f938c0b99
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dto/SupplierQuery.java,5/7/57797c323a45bc67208d3507e8b58517d306782a
<EFBFBD>
\nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/IBmSupplierService.java,d/f/df8b3befbd76ade64ad578e8f836ebe7dc24a98f
<EFBFBD>
hnladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/xml/BmSupplierMapper.xml,c/f/cfb3b9e8e5934039226c5f151fead52f255d3821
<EFBFBD>
anladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java,6/a/6a0eb843818d8343bd44f2eb6fb96a2a17ad511d
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/base_manage/customer/service/dto/CustomerQuery.java,6/b/6b42b2e9bd0103ce4b84ace62d3bb90c20fcbc63
<EFBFBD>
dnladmin-system/src/main/java/org/nl/wms/base_manage/customer/service/impl/BmCustomerServiceImpl.java,6/5/659d014d87cf2cb817ac8aa861692dafad6985ad
<EFBFBD>
\nladmin-system/src/main/java/org/nl/wms/base_manage/customer/service/IBmCustomerService.java,5/e/5e792c3d58824a1b5f4e3d3d409be838f13c2ea8
<EFBFBD>
anladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java,9/d/9de12ba5bf4d57379fd943ac5f598bff5f7e9b09
<EFBFBD>
hnladmin-system/src/main/java/org/nl/wms/base_manage/customer/service/dao/mapper/xml/BmCustomerMapper.xml,4/8/484515574155d74e2c0fb2f642d010e81da02c12
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/base_manage/customer/service/dao/mapper/BmCustomerMapper.java,b/0/b0de42f7cfd8eba26add38c170ecd5ad35938d74
<EFBFBD>
Xnladmin-system/src/main/java/org/nl/wms/base_manage/customer/service/dao/BmCustomer.java,8/c/8c15afe3f84fae04db4771870c3d8152dc6112b7
<EFBFBD>
^nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/IBmMeasureUnitService.java,8/d/8d5ad7519a7c25dad5b9ac989ab15bddd38c1744
<EFBFBD>
Vnladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dto/UnitQuery.java,a/8/a8ae509ac1fa3c77b43dddd6cf62c4d5b1bda604
<EFBFBD>
jnladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/mapper/xml/BmMeasureUnitMapper.xml,5/c/5cf8db646567d767805c9e2c9d75f48bf84445e6
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/mapper/BmMeasureUnitMapper.java,1/5/15440390b143518a793fd475726cbb96e5d1efa0
<EFBFBD>
Znladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/BmMeasureUnit.java,0/1/0133ebeb5b54aed369d35ab277528534ef73f401
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/impl/BmMeasureUnitServiceImpl.java,e/7/e70f0441bebe61574c00213f32c632aa2897c910
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/base_manage/measure/controller/BmMeasureunitController.java,0/f/0f9efa8480b10f9adaa49898a79423f2ab0f6c1f
<EFBFBD>
dnladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/impl/BmSupplierServiceImpl.java,4/f/4fc9e6b89767bdae6bb64ea2eb8bdc73585e739c
<EFBFBD>
pnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/mapper/BmClassStandardMapper.java,b/8/b8c90222b0fbaa1656cc1a615e04b9241ec81824
<EFBFBD>
snladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/mapper/xml/BmClassStandardMapper.xml,3/7/37d758a03ddcd0692bbbe7ae35360dd98d7d5b5f
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/BmClassStandard.java,c/3/c3513486b58f2bffcb3f978eee39f1e1b23769d1
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dto/BmClassStandardTree.java,a/e/ae5dc050d1cb8e346c5d74dfdfbe81380844f770
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/IBmClassStandardService.java,c/5/c5993a1d750d7041a840a41a573358502883c091
x
Hnladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java,9/e/9ebc8f924932814262c2d3968e862babba46e751
<EFBFBD>
^nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java,7/b/7b8bf4a0135d0713328837025e2a155860cb8beb
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/AuthorizationController.java,3/c/3c48d8ac2d509e895a423ffda0e2e802719133e1
<EFBFBD>
lnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java,1/6/1682613e5ad252f692c7fe9869e05ba6e993ec0b
<EFBFBD>
wnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java,6/2/62bba69557651d0ef8689854cf0192b608958ca8
<EFBFBD>
^nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java,8/e/8e8e6084896058ef5d6e32aeaa325a4d807bd299
<EFBFBD>
anladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/deployment/dao/ActReProcdef.java,7/6/76fed3f20afbc6705f28b3aad13a6311716b5bf9
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/ActDeModelServiceImpl.java,5/c/5c10ac01b36058f8bd7ded010f6280af0a23920f
<EFBFBD>
jnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/StartProcessInstanceVo.java,4/5/45796bb285239bb18fdf14255642f73cd274e990
<EFBFBD>
Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java,3/e/3eca87912d8f4d89cb48ed4d3a065400c26eb414
<EFBFBD>
Xnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/enums/TaskTypeEnum.java,9/a/9a80ba3c6d691004cb168b6bef614f1678af32d6
<EFBFBD>
Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dto/ModelQuery.java,9/1/91fd50fd8729292d9e298d85ba01a6b5af8593fa
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/deployment/IActReProcdefService.java,c/b/cbcdb312056e097d6f706d22c125cde37089b39f
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java,1/d/1d97c53dde4069e95a2a9b5e87f1839ef118d3b2
m
=nladmin-system/src/main/java/org/nl/common/TableDataInfo.java,a/8/a85494925056ae5a2edbd2ec7eee55976b36080f
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java,a/4/a44b52a4bc649baab711c5bd57004aa22cc2206b
p
@nladmin-system/src/main/java/org/nl/common/enums/QueryTEnum.java,f/b/fb1fedd5a3547392fa64608ed6291c9931a5ae3d
t
Dnladmin-system/src/main/java/org/nl/common/domain/entity/QParam.java,c/8/c81fda2ed02b5dc9c21d70a813552d849bd642d8
<EFBFBD>
`nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java,2/8/28bd56139ae8c49fb8b946a5db641cec587fe696
<EFBFBD>
jnladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java,1/7/17ecbef3e2c19e65dfe2e8c69c7b2fba4fcda5eb
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/ISyncFormMappingService.java,2/0/20de6d2c7b011146c7b4125faa76cbb7e8a530d1
<EFBFBD>
anladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/dao/SyncFormMapping.java,1/1/111d63443dee5cc4cd3f439604732348c245895d
<EFBFBD>
mnladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/impl/SyncFormMappingServiceImpl.java,f/d/fd8b72fa44840c56a25536d5ae8b06b3a561a0c8
<EFBFBD>
unladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/SourceDataTypeHandler.java,0/7/073b8a027d5098b0e28da8f7a8076966a638cb0e
<EFBFBD>
<EFBFBD>nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java,a/3/a3a5a2860090b68804b8fad26d512236f3eae5b4
<EFBFBD>
Xnladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java,2/0/20d3f5ca66f748f0a2bada36023b0308d4d552c0
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java,6/c/6cccbeca1a92061e0584fff09e8c598223b372a6
<EFBFBD>
onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java,0/3/03deb92a49c3f6457dfffe6f76373226a7d40537
<EFBFBD>
inladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml,9/b/9bde1f384edfc1c2eff393277b85a9af8acc73f8
w
Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java,9/4/947b18c9ba0a550a79685e0bbb0c2e008a78ecf4
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java,2/1/21151f545e109906fa59e7b7b0154d60b7c5a908
<EFBFBD>
\nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java,4/9/496d3ff8da16d905d8db54d3a8b7f523ee06f40f
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java,2/b/2bf79ab59317d0d6b177fe4f01b5d69517e7c0bd
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java,d/5/d5175090d4638102781aaeb7ed369c4622e8f70e
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java,0/e/0e3d3e1c71243632b0cf4d4ce5d42bab41cbcbe2
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java,d/2/d20e36ad1812a5acaa116fa022508a7ca0cc28fa
<EFBFBD>
`nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java,c/4/c4b778bf4651d57a395e7eb2a9bcc835c076436d
<EFBFBD>
rnladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java,a/6/a62df3e5474a7acae99ed74773f4535db36a3580
<EFBFBD>
mnladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/IBmExternalFieldMappingService.java,4/f/4fe5f0433cb3b03dbc94bbfa46bd64884cbcb475
<EFBFBD>
unladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/impl/BmExternalFieldMappingServiceImpl.java,f/e/fe262f89e2718544e540e3b2ca63fb65f61f49dd
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java,0/4/04a9b66d50a0df59977636c2584c0b33c3c80690
<EFBFBD>
anladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java,5/6/56960b82d5e3cd8674859d178ac78e8156e56eff
<EFBFBD>
inladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java,1/7/1734a0b319cf43162c6b2ef4cf7dc9cd2e838740
<EFBFBD>
dnladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java,b/9/b91c99205a3139e42424e60dd5731332487e0667
<EFBFBD>
Znladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java,9/0/90cde14dd61225ba9c416f9d10269bab669cd1ad
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml,2/7/27ddde88021914d58fc637c1e790357ee86616ab
<EFBFBD>
Wnladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java,6/b/6b1cc623ef87736e8a936dc1ca0c0b2c653fb82a
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/config/InitFlowConfig.java,7/5/758c32dcd4ffc4e615e513ba6feb54def23e084a
<EFBFBD>
mnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/EndEventConverter.java,6/e/6eba45c7f4a86406f18cf8599c9e330f4b23040f
<EFBFBD>
inladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/FormConverter.java,9/a/9a6b510dccb8794c727b71c25590b6520f4bbd48
<EFBFBD>
lnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/GatewayConverter.java,8/3/83f3cb02f57e755d93244600e35e950064d6ec3f
<EFBFBD>
lnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SendMsgConverter.java,4/0/40ad18873e8cf378f1051e3326af26f0ca2dc9fa
<EFBFBD>
qnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SequenceFlowConverter.java,4/9/490424a4892ae4e55d135cf29edcabfec388ac84
<EFBFBD>
onladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java,2/8/282eb24a7de2cae2f70415e7cc63431514f66170
<EFBFBD>
onladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/StartEventConverter.java,5/0/50a4ede2946a62d868a5306a4048e19a0940aa40
<EFBFBD>
nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/StrucFormConverter.java,f/1/f18bf3c7284c279afac0739d24da476d29f4eced
<EFBFBD>
onladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SubProcessConverter.java,d/c/dca2288987a2f53c6667e6f21703d55f7a920fb7
<EFBFBD>
hnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/BaseNodeConverter.java,f/b/fb062fce1cddfa0a73e9674c68ee033c100e9e32
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/BpmnJSONConverter.java,d/e/dea9f27dd93ab9f3677417bf056c1cec6bb18b55
w
Gnladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java,f/0/f062b578de11e2952654784226f11bae7019cd76
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java,c/8/c82a62a04d41331b300a120923e2949be6b68bb3
<EFBFBD>
dnladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java,a/b/abf5637a5a0d3b1f78e4a21306cffd484e9011f5
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java,2/4/244e466911a3a496e08587100bdf062fd7e13ed4
<EFBFBD>
hnladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java,f/9/f94bd5c2e5469d880023b16729b09dca7eccdca4
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/StIvtStructattr.java,e/5/e584c062454e373b331c75c111b2fd6543e9c6dc
<EFBFBD>
_nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java,b/1/b10dff3efd70a39f23a25125ca4669d404c03bbb
<EFBFBD>
knladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml,d/3/d3143bfeb3b1a633f41056e1c3d660d3ac2e1b14
u
Enladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java,d/a/da94e2f9402ad75ef272f2e95148c573aee9a1ff
<EFBFBD>
Ynladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/SchBaseTask.java,4/a/4a2188ff934d5838c3361cc66d54b717f4ae8b43
p
@nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java,d/a/da2cfc661b6ccefab91ec1ba98461be21c19e65a
<EFBFBD>
\nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java,3/a/3a80eecf978aec3f47fcfb62925c4e9bc24bd471
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java,d/7/d75ac1c2c3c2e5ce56355f91aecccc4dc7b58e4d
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java,9/d/9d0436677d004c5ce485ddbb8f4ba57bf9efe393
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java,b/5/b5c97852157076b62f277a89f3a91de547e658b9
<EFBFBD>
inladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml,8/2/82abf35a15b6b99c49b8bff42ed7d48ae3c35782
<EFBFBD>
^nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java,5/1/51a4fbcc58b8b420ef22a116990b3cb695ed46fe
<EFBFBD>
Ynladmin-system/src/main/java/org/nl/wms/dispatch_manage/dispatch/TaskDispatchService.java,5/6/56270e92dcf49eabaa4b489e407879d7891295f6
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java,f/f/ff212f1da42fe37170690dbb3fde617bd6d4ea4d
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/AgvTaskHandler.java,4/8/48d893d6babffa6fbccdae11c1603e05cc0d1140
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java,c/a/caa59130099a147acf733a484dae55badb122e24
<EFBFBD>
`nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java,f/4/f4d6da57d25a0f0b8fd7caeadffca82408ea455b

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/AlleyAveRuleHandler.java
View File

@@ -2,12 +2,12 @@ package org.nl.wms.decision_manage.handler.impl.base;
import cn.hutool.core.util.ObjectUtil;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
import org.nl.wms.stor_manage.struct.service.dto.StructattrQuery;
import org.nl.wms.decision_manage.handler.Decisioner;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/ClusterRuleHandler.java
View File

@@ -4,10 +4,10 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.utils.ListOf;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
import org.nl.wms.decision_manage.handler.Decisioner;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java
View File

@@ -2,12 +2,13 @@ package org.nl.wms.decision_manage.handler.impl.base;
import com.alibaba.fastjson.JSONArray;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.io.service.iostor_dtl.dao.StIvtIostorinvdtl;
import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
import org.nl.wms.decision_manage.handler.Decisioner;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/NearbyRuleHandler.java
View File

@@ -9,8 +9,7 @@ import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
import org.nl.wms.decision_manage.handler.Decisioner;
import org.nl.wms.decision_manage.service.dao.StStrategyConfig;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/WeightRuleHandler.java
View File

@@ -3,9 +3,9 @@ package org.nl.wms.decision_manage.handler.impl.base;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
import org.nl.wms.decision_manage.handler.Decisioner;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java
View File

@@ -20,10 +20,13 @@ import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler;
import org.nl.wms.flow_manage.flow.service.history.IActHiExecutionService;
import org.nl.wms.flow_manage.flow.service.history.dao.ActHiExecution;
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
import org.nl.wms.stor_manage.io.service.in.iostor.IStIvtIostorinvInService;
import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
import org.nl.wms.stor_manage.io.service.iostor.IStIvtIostorinvService;
import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.io.service.iostor_dtl.dao.StIvtIostorinvdtl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -39,14 +42,14 @@ import org.springframework.stereotype.Service;
@Service("form")
public class FormActivityBehavior extends FlowNodeActivityBehavior<JSONObject> {
@Autowired
IBmFormStrucService iBmFormStrucService;
private IBmFormStrucService iBmFormStrucService;
@Autowired
IStIvtIostorinvdtlService iostorinvdtlService;
private IStIvtIostorinvdtlService iostorinvdtlService;
@Autowired
IStIvtIostorinvInService iostorinvService;
private IStIvtIostorinvService iostorinvService;
//分配明细用公用表
@Autowired
IPmFormDataService iPmFormDataService;
private IPmFormDataService iPmFormDataService;
@Autowired
private IActHiExecutionService actHiExecutionService;
@@ -92,7 +95,7 @@ public class FormActivityBehavior extends FlowNodeActivityBehavior<JSONObject> {
mst_json.put("bill_type",currentNode.getBill_type());
mst_json.put("code",CodeUtil.getNewCode("IO_CODE"));
mst_json.put("source_form_type",handler.getString("source_form_type"));
StIvtIostorinvIn mst = mst_json.toJavaObject(StIvtIostorinvIn.class);
StIvtIostorinv mst = mst_json.toJavaObject(StIvtIostorinv.class);
handler.put("form_id",mst.getId());
JSONArray itemArr = handler.getJSONArray("item");

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/DecisionHandler.java
View File

@@ -11,14 +11,14 @@ import org.nl.common.utils.SpringContextHolder;
import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowElement;
import org.nl.wms.flow_manage.flow.framework.entity.node.impl.task.impl.ServerTask;
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
import org.nl.wms.decision_manage.handler.Decisioner;
import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity;
import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java
View File

@@ -42,6 +42,11 @@ public class MdGruopDick implements Serializable {
*/
private String status;
/**
* 组盘
*/
private String vehicle_code;
/**
* 备注
*/

38
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
View File

@@ -17,7 +17,6 @@ import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl;
import org.nl.wms.md_manage.group_dick.service.dao.mapper.MdGruopDickMapper;
import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
@@ -69,34 +69,28 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
String now = DateUtil.now();
forms.put("create_name",SecurityUtils.getCurrentNickName());
forms.put("create_time", now);
forms.put("id",IdUtil.getStringId());
forms.put("id",IdUtil.getStringId());
forms.put("status", StatusEnum.FORM_STATUS.code("生成"));
forms.put("code", CodeUtil.getNewCode("md_group_dick"));
MdGruopDick mdGroupMst = forms.toJavaObject(MdGruopDick.class);
List<MdGruopDtl> items = new ArrayList<>();
List<MdPbVehicleMater> vehicleMaters = new ArrayList<>();
List<Map> dtlJson = new ArrayList<>();
Map<String, MdGruopDick> map = new HashMap<>();
if (!CollectionUtils.isEmpty(forms)){
for (int i = 0; i < tableData.size(); i++) {
Map item = tableData.get(i);
item.put("update_name",SecurityUtils.getCurrentNickName());
item.put("update_time", now);
item.put("id",IdUtil.getStringId());
item.put("dick_id",mdGroupMst.getId());
JSONObject item_json = new JSONObject(item);
MdGruopDtl mdGruopDtl = item_json.toJavaObject(MdGruopDtl.class);
MdPbVehicleMater vehicleMater = item_json.toJavaObject(MdPbVehicleMater.class);
items.add(mdGruopDtl);
JSONObject item = tableData.get(i);
String vehicle_code = item.getString("vehicle_code");
MdGruopDick mdGruopDick = map.get(vehicle_code);
if (mdGruopDick ==null){
MdGruopDick dick = forms.toJavaObject(MdGruopDick.class);
dick.setVehicle_code(vehicle_code);
dick.setCode(CodeUtil.getNewCode("md_group_dick"));
dick.setId(IdUtil.getStringId());
map.put(vehicle_code,dick);
}
MdPbVehicleMater vehicleMater = item.toJavaObject(MdPbVehicleMater.class);
vehicleMater.setCreate_time(now);
vehicleMater.setCreate_name(SecurityUtils.getCurrentNickName());
vehicleMaters.add(vehicleMater);
dtlJson.add(MapOf.of("form_id",mdGruopDtl.getId()
,"t",item_json
,"source_form_type",mdGruopDtl.getSource_form_type()
,"source_form_id",mdGruopDtl.getSource_form_id()));
}
}
this.save(mdGroupMst);
this.saveBatch(map.values());
iMdPbVehicleMaterService.saveBatch(vehicleMaters);
}

34
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/out/StIvtIostorinvOutController.java → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java
View File

@@ -1,19 +1,15 @@
package org.nl.wms.stor_manage.io.controller.out;
package org.nl.wms.stor_manage.io.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.MapOf;
import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
import org.nl.wms.stor_manage.io.service.dto.StorInvOutQuery;
import org.nl.wms.stor_manage.io.service.dto.StorInvQuery;
import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
import org.nl.wms.stor_manage.io.service.out.iostor.IStIvtIostorinvOutService;
import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut;
import org.nl.wms.stor_manage.io.service.out.iostor_dtl.IStIvtIostorinvdtlOutService;
import org.nl.wms.stor_manage.struct.service.dto.StructattrVechielDto;
import org.nl.wms.stor_manage.io.service.iostor.IStIvtIostorinvService;
import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -31,29 +27,29 @@ import java.util.Map;
* @since 2024-03-28
*/
@RestController
@RequestMapping("api/stIvtIostorinvOut")
public class StIvtIostorinvOutController {
@RequestMapping("api/stIvtIostorinv")
public class StIvtIostorinvController {
@Autowired
private IStIvtIostorinvOutService iStIvtIostorinvOutService;
private IStIvtIostorinvService iStIvtIostorinvService;
@Autowired
private IStIvtIostorinvdtlOutService iStIvtIostorinvDtlOutService;
private IStIvtIostorinvdtlService iStIvtIostorinvDtlOutService;
@Autowired
private ISchBaseTaskService iSchBaseTaskService;
@GetMapping
public ResponseEntity<Object> getAll(StorInvOutQuery query, PageQuery page) {
Page<StIvtIostorinvOut> result = iStIvtIostorinvOutService.page(page.build(), query.build());
public ResponseEntity<Object> getAll(StorInvQuery query, PageQuery page) {
Page<StIvtIostorinv> result = iStIvtIostorinvService.page(page.build(), query.build());
return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
}
@PostMapping("delete")
public ResponseEntity<Object> delete(@RequestBody List<String> ids) {
iStIvtIostorinvOutService.removeByIds(ids);
iStIvtIostorinvService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> save(@RequestBody JSONObject form) {
iStIvtIostorinvOutService.save(form);
iStIvtIostorinvService.save(form);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -70,7 +66,7 @@ public class StIvtIostorinvOutController {
*/
@PostMapping("/outDecision")
public ResponseEntity<Object> outDecision(@RequestBody JSONObject dtl) {
String struct_code = iStIvtIostorinvOutService.dispense(dtl);
String struct_code = iStIvtIostorinvService.dispense(dtl);
return new ResponseEntity<>(struct_code,HttpStatus.OK);
}
@@ -81,7 +77,7 @@ public class StIvtIostorinvOutController {
*/
@PostMapping("/cancelDecision")
public ResponseEntity<Object> cancelDecision(@RequestBody JSONObject dtl) {
iStIvtIostorinvOutService.canceldispense(dtl);
iStIvtIostorinvService.canceldispense(dtl);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -93,7 +89,7 @@ public class StIvtIostorinvOutController {
@PostMapping("/taskOpen")
public ResponseEntity<Object> taskOpen(@RequestBody JSONObject dtl) {
iStIvtIostorinvOutService.taskOpen(dtl);
iStIvtIostorinvService.taskOpen(dtl);
return new ResponseEntity<>(HttpStatus.OK);
}
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/StIvtIostorinvOutMapper.java
View File

@@ -1,6 +1,6 @@
package org.nl.wms.stor_manage.io.service.iostor.dao.mapper;
import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java
View File

@@ -10,8 +10,6 @@ import org.nl.wms.flow_manage.flow.service.history.IActHiExecutionService;
import org.nl.wms.flow_manage.flow.service.history.dao.ActHiExecution;
import org.nl.wms.flow_manage.monitor.event.FlowEndEvent;
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
import org.nl.wms.stor_manage.io.service.in.iostor.IStIvtIostorinvInService;
import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/StructEventListener.java
View File

@@ -6,8 +6,9 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.common.enums.StatusEnum;
import org.nl.common.publish.AbstraceListener;
import org.nl.wms.dispatch_manage.task.handler.StructEvent;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.io.service.iostor_dtl.dao.StIvtIostorinvdtl;
import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;