Commit Graph
66 Commits
Author SHA1 Message Date
秦鸿展 fcb997d4ca 日常BUG任务修改调整 2026-02-10 11:20:59 +08:00
秦鸿展 f260b73b80 库存分配时如果没有库存抛异常
导入模版没有物料抛异常
2026-02-10 10:12:13 +08:00
秦鸿展 308f79b804 任务BUG修改 2026-02-09 16:53:46 +08:00
秦鸿展 9cdb5a8896 任务BUG修改 2026-02-09 14:02:08 +08:00
秦鸿展 bea406051f 仓库管理按时间倒序排序 2026-02-09 13:16:25 +08:00
秦鸿展 244b8d7e6e 基础数据的BUG修改 2026-02-07 17:22:11 +08:00
秦鸿展 c652ccd087 Merge branch 'dev_qinhongzhanWMS' into wms_dev 2026-02-07 13:53:20 +08:00
秦鸿展 52a34779ec 技术数据仓库查询修改 2026-02-07 13:52:49 +08:00
秦鸿展 44d295f702 Merge branch 'dev_qinhongzhanWMS' into wms_dev
# Conflicts:
#	mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml
2026-02-07 10:25:42 +08:00
秦鸿展 fe1aadd8ac 租赁管理(编辑、创建时间修改时间查询)BUG修改 2026-02-07 10:24:43 +08:00
zhou-hongcheng fc1ddec2ba 物料条码模糊查询 2026-02-06 13:08:48 +08:00
zhou-hongcheng d9e5d5187e 根据仓库id过滤列表,根据仓库id查询仓库名称 2026-02-06 10:55:36 +08:00
秦鸿展 14dcecb5d4 仓库编码模糊查询 2026-02-05 16:46:12 +08:00
zhou-hongcheng 43b3773e3e Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-30 09:15:39 +08:00
zhou-hongcheng 480d50f9da 货主租赁明细批量修改 2026-01-30 09:15:05 +08:00
秦鸿展 cd79abeb32 Merge branch 'dev_qinhongzhanWMS' into wms_dev 2026-01-29 17:26:34 +08:00
秦鸿展 43aec4ac0d 批次规则bug修改 2026-01-29 17:26:05 +08:00
zhou-hongcheng 52779f0196 Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-29 14:46:31 +08:00
zhou-hongcheng db86df135a 仓库出租率功能模块 2026-01-29 14:44:27 +08:00
秦鸿展 e0d3e40847 批次规则的修改 2026-01-29 14:03:38 +08:00
秦鸿展 49cdce7b9c 批次规则的修改 2026-01-29 13:50:03 +08:00
秦鸿展 4b9c2978ae 入库管理查询仓库修改 2026-01-28 14:49:11 +08:00
zhou-hongcheng b72134a936 租赁管理补充仓库和货主字段 2026-01-28 14:34:19 +08:00
zhou-hongcheng df671374b3 物料新增system模块 2026-01-26 09:50:54 +08:00
zhou-hongcheng 12a5cc6129 批次详情的子项修改实际为新增新的一条bug修复 2026-01-24 15:35:09 +08:00
zhou-hongcheng 3196c3416a Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-23 15:31:44 +08:00
zhou-hongcheng a51e6e3f3d 配置 2026-01-23 15:30:46 +08:00
王奎兴 4dfa961a58 出库单导入; 2026-01-22 13:10:35 +08:00
zhou-hongcheng 55b6554216 物料管理批次bug和品牌idbug 2026-01-22 11:36:47 +08:00
zhou-hongcheng f3f10d10db 租赁管理 2026-01-21 16:06:32 +08:00
zhou-hongcheng 2cf42f6e06 修改bug添加子项保存不上,和查询子项查询不到 2026-01-20 14:53:56 +08:00
秦鸿展 aab59723f9 Merge remote-tracking branch 'origin/dev' into dev 2026-01-19 15:32:30 +08:00
秦鸿展 7f8732dd02 选择车队不一致修改 2026-01-19 15:32:00 +08:00
hjx b25c795d4e 正式环境配置 2026-01-16 13:30:16 +08:00
hjx b6f5ed6dab 类别查询修改 2026-01-16 11:47:46 +08:00
hjx 90e6ec8086 测试环境配置 2026-01-16 10:47:22 +08:00
hjx ff334b155c 费用科目查询修改 2026-01-16 10:08:01 +08:00
hjx 015162d5c9 Merge branch 'dev' into master
# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
2026-01-15 03:36:33 +08:00
王奎兴 e5f8ddd8b6 配置文件修改; 2026-01-14 22:31:02 +08:00
王奎兴 84ab2c8bf9 Merge remote-tracking branch 'refs/remotes/origin/dev' into test
# Conflicts:
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
2026-01-14 16:40:52 +08:00
hjx 14cfad6b50 修改科目创建订单默认显示设置 2026-01-14 15:20:06 +08:00
hjx abf2847475 科目信息修改 2026-01-14 14:56:25 +08:00
1745237360-cloud 035593b419 数据权限的bug修改260113 2026-01-13 11:32:57 +08:00
1745237360-cloud c8493dd658 数据权限的bug修改 2026-01-12 14:30:00 +08:00
1745237360-cloud 4b427e1b2e 数据权限的修改 2026-01-10 16:39:33 +08:00
hjx af7dda73de Merge branch 'dev' into master
# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/resources/bootstrap.yml
2026-01-07 15:04:36 +08:00
王奎兴 8b98c54d11 Revert "回复大小写敏感;"
This reverts commit 6cb96410a2.
2026-01-05 15:50:23 +08:00
王奎兴 fd579a6f42 nacos配置; 2026-01-05 13:17:16 +08:00
王奎兴 f14547eb53 nacos配置; 2026-01-05 08:42:07 +08:00
王奎兴 6cb96410a2 回复大小写敏感; 2025-12-31 14:05:07 +08:00