root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,391 Commits 11 Branches 0 Tags
473dfb06daab61f95df18ae98271bdd4b46b4389
Commit Graph

49 Commits

Author SHA1 Message Date
Eric
473dfb06da feat(wms): 添加 MDM 主数据平台与 LMS 接口功能 
- 新增 CommonResponseDto 类用于统一返回消息格式
- 添加 MdmToLmsController 控制器处理 MDM 与 LMS 之间的接口请求
- 实现 MdmToLmsService接口和 MdmToLmsServiceImpl 实现类，提供客户、供应商和物料信息的传输功能- 新增 ResponseItemsData 类用于封装响应项数据
- 定义 StatusEnum 枚举表示接口状态码
- 在 logback-spring.xml 中添加 MDM 日志配置
 2025-06-12 17:10:23 +08:00
zhangzq
2dfe5f22de Merge remote-tracking branch 'origin/master_merge' into master_1_opt 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
#	lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
#	lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java
#	lms/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java
#	lms/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CellTypeEnum.java
#	lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
#	lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
#	lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql
#	lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
#	lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java
#	lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
#	lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
#	lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
#	lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
#	lms/nladmin-system/src/main/resources/config/application-dev.yml
#	lms/nladmin-system/src/main/resources/config/application-prod.yml
#	lms/nladmin-ui/src/views/login.vue
#	lms/nladmin-ui/src/views/system/user/index.vue
#	lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
#	lms/nladmin-ui/src/views/wms/sch/task/index.vue
 2025-05-22 13:44:35 +08:00
zhangzq
98f26916cc add:子卷解绑定增加任务校验，已经装箱入库的不允许解绑 2025-04-29 14:56:28 +08:00
zhangzq
d2a8682f4a add:一楼看板增加数据；fix:出库任务完成报错；opt:任务查询不到优化 2025-04-25 13:59:33 +08:00
zhangzq
e6a7b320b3 opt:优化日志 2025-04-20 10:13:44 +08:00
zhangzq
eabc74c171 add:增加分切看板接口；增加日志条件；增加子卷称重记录 2025-04-19 16:42:01 +08:00
zhangzq
bbccff7c91 opt:优化日志配置 2025-04-11 21:35:45 +08:00
zhangzq
636e347177 fix:日志配置，回传MES改成同步 2025-04-11 14:38:23 +08:00
zhangzq
52e9cadce9 fix:木箱出库时存在移库任务将出库锁释放 2025-03-11 19:46:48 +08:00
zhangzq
57afe00a14 add:增加打包间子卷信息展示 2025-03-11 11:45:15 +08:00
zhangzq
50956cb3ed add:增加打包间子卷信息展示 2025-03-08 14:20:51 +08:00
zhangzq
d880051422 add:增加打包间子卷信息展示 2025-03-08 13:50:32 +08:00
liyongde
a7d2c0288f rev: 二期内包间改造 2025-02-24 17:11:22 +08:00
zhangzq
c61134f6fb rev:日志打印，add:空木箱入库mes回传 2024-12-26 22:12:47 +08:00
ZHOUZ\Noble'lift
14090a0d46 rev：集群相关修改 2024-01-23 17:44:07 +08:00
ludj
14eb8b81c5 rev:去掉SWAGGER 2023-12-29 09:43:11 +08:00
zhangzq
ca77135394 opt:日志优化 2023-12-28 19:34:08 +08:00
ludj
9695725e76 rev: 日志配置更新 2023-12-25 17:08:57 +08:00
ludj
8290ed2810 接口日志参数 2023-02-20 11:39:55 +08:00
ludj
e6342cef42 解决日志显示乱码问题 2023-02-20 10:59:29 +08:00
ZHOUZ\Noble'lift
32c845edf8 修改 2023-02-14 14:48:30 +08:00
zhangzhiqiang
565f48a477 add:es线上配置 2023-02-13 10:20:41 +08:00
zhangzhiqiang
e83ce819e8 add:异常堆栈换行2 2023-02-12 10:21:43 +08:00
zhangzhiqiang
62c4c711a0 add:生产es配置 2023-02-10 10:57:22 +08:00
zhangzhiqiang
1ff4c7ccaf mdf:修改es配置 2023-02-10 10:51:48 +08:00
zhangzhiqiang
d0eabfd08f fix时间查询 2023-02-09 19:46:46 +08:00
zhangzhiqiang
c0661d4c39 add:es 2023-02-09 18:00:20 +08:00
zhangzhiqiang
c4cf28c9c1 1 2023-02-09 15:00:24 +08:00
zhangzhiqiang
de549c2a1a add:es 2023-02-09 13:07:57 +08:00
ludj
80160c1569 代码更新 2023-02-07 21:41:51 +08:00
ludj
dd7ef7f9ba es集成，去掉loki 2023-02-07 17:42:33 +08:00
zhangzhiqiang
3215b86264 mdf:修改异常日志 2023-02-06 09:27:48 +08:00
zhangzhiqiang
c89e370a51 add:x1 2023-02-05 21:37:16 +08:00
zhangzhiqiang
037c0e67a7 add:x 2023-02-05 21:03:37 +08:00
ludj
5ce34f4a29 去掉plumelog 2023-02-05 19:31:38 +08:00
zhangzhiqiang
10934b9dfe add:log 2023-02-05 19:25:18 +08:00
ludj
d3f0dfa427 日志框架和定时任务线程配置修改修改 2023-01-27 12:38:26 +08:00
ZHOUZ\Noble'lift
4c375145e3 修改 2023-01-12 09:50:29 +08:00
zhangzhiqiang
390066178d add:生产环境日志输出控制台 2022-12-30 16:35:22 +08:00
zhangzhiqiang
0415f8a10e 定时任务及loki 2022-12-30 13:56:43 +08:00
ZHOUZ\Noble'lift
6af24f299a Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_test 2022-12-30 10:21:01 +08:00
ZHOUZ\Noble'lift
2294282665 日志参数 2022-12-30 10:17:29 +08:00
zhangzhiqiang
e5b40787c8 add：sql 2022-12-29 17:04:41 +08:00
liuxy
29edd52442 代码更新 2022-12-14 11:01:49 +08:00
ZHOUZ\Noble'lift
79352b092d 修改 2022-11-18 16:44:09 +08:00
ldj_willow
714b2231ee 日志配置文件更新 2022-11-08 14:56:23 +08:00
ldj_willow
4ff5944d5d 任务模块更新 2022-10-27 10:32:25 +08:00
ZHOUZ\Noble'lift
2e6a791edf 出入库初始化 2022-10-25 18:43:38 +08:00
lyd
c61b5e4641 初始化 2022-10-15 15:31:18 +08:00