 秦鸿展
|
3ec47385be
|
测试环境配置修改
|
2026-05-21 17:03:45 +08:00 |
|
 王奎兴
|
8a4d72e4fb
|
发布测试;
|
2026-05-21 16:22:32 +08:00 |
|
|
王奎兴
|
dc26614e68
|
Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts:
# mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java
# mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
|
2026-05-21 16:14:56 +08:00 |
|
|
王奎兴
|
ff5f078a78
|
配置修改;
|
2026-05-21 10:05:02 +08:00 |
|
|
王奎兴
|
e784dd289c
|
新正式环境配置;
|
2026-05-19 10:10:16 +08:00 |
|
|
秦鸿展
|
99ceec0b77
|
Merge branch 'dev_20260429' into dev_WMS20260401
|
2026-05-16 16:14:57 +08:00 |
|
|
秦鸿展
|
3b5674b10c
|
计费策略修改封装
|
2026-05-16 10:43:09 +08:00 |
|
|
秦鸿展
|
6d0211d686
|
计费策略修改
|
2026-05-16 09:59:11 +08:00 |
|
|
秦鸿展
|
16fd402975
|
入库费用登记查询
|
2026-05-15 14:10:43 +08:00 |
|
|
王奎兴
|
206c85aaf7
|
Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts:
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
# mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java
|
2026-05-15 13:55:42 +08:00 |
|
|
秦鸿展
|
06abee70e3
|
字典类型加上组织字段修改
|
2026-05-14 15:23:48 +08:00 |
|
|
秦鸿展
|
f8c6be9db8
|
字典类型加上组织字段
|
2026-05-14 14:18:51 +08:00 |
|
|
秦鸿展
|
3867226d3f
|
出入库费用查询过滤
|
2026-05-14 09:52:06 +08:00 |
|
|
秦鸿展
|
b24fa2cd3e
|
单价列表重复修改
|
2026-05-13 16:24:05 +08:00 |
|
|
秦鸿展
|
80d93f2d7b
|
单价列表重复修改
|
2026-05-13 16:21:09 +08:00 |
|
|
秦鸿展
|
0514d223bb
|
单价列表重复修改
|
2026-05-13 16:03:41 +08:00 |
|
|
秦鸿展
|
bc2a040b80
|
单价列表重复
|
2026-05-13 15:47:24 +08:00 |
|
|
秦鸿展
|
c60dca7fe0
|
入库、出库 费用登记费用科目列表查询修改
|
2026-05-13 15:31:19 +08:00 |
|
|
王奎兴
|
acbc8bfe02
|
计费单据 计费流水 费用科目添加计费单位等信息;
|
2026-05-11 17:41:35 +08:00 |
|
 zhaoqing
|
e7202f100d
|
物料管理-新增/编辑-添加毛重，修改汇率管理问题
|
2026-05-11 15:55:43 +08:00 |
|
|
秦鸿展
|
11a0b15d19
|
仓库绑定更改
|
2026-05-11 09:00:48 +08:00 |
|
|
王奎兴
|
56193f6d23
|
Merge remote-tracking branch 'origin/dev_20260429' into dev_20260429
|
2026-05-09 16:18:20 +08:00 |
|
|
王奎兴
|
27af017450
|
计费单据查询单价;
|
2026-05-09 16:17:55 +08:00 |
|
|
zhaoqing
|
93d0f258c3
|
基础信息-物料管理-新增 添加货物类型
|
2026-05-09 14:54:27 +08:00 |
|
|
王奎兴
|
0ca5bed1f9
|
计费单据查询单价;
|
2026-05-09 11:13:28 +08:00 |
|
|
zhaoqing
|
f5b4b6acd1
|
基础信息-物料管理-新增页面 添加新下拉框数据
|
2026-05-09 10:50:25 +08:00 |
|
|
zhaoqing
|
4d71a2e6e1
|
基础信息-物料管理-新增页面 添加下拉框数据
|
2026-05-08 19:11:19 +08:00 |
|
|
秦鸿展
|
b754aaf949
|
详情查询修改
|
2026-05-07 17:43:54 +08:00 |
|
|
王奎兴
|
4c32d4032e
|
app仓储订单列表；
|
2026-05-07 09:43:11 +08:00 |
|
|
王奎兴
|
2109a1b5b3
|
根据userid获取仓库;
|
2026-05-07 08:54:58 +08:00 |
|
|
王奎兴
|
8f7d44d725
|
配置修改;
|
2026-04-29 13:26:53 +08:00 |
|
|
王奎兴
|
3759a54b49
|
新增计费单据查询报错修改;
|
2026-04-29 09:40:44 +08:00 |
|
|
王奎兴
|
cfbef4bc30
|
发布测试环境修改配置;
|
2026-04-28 14:50:25 +08:00 |
|
|
秦鸿展
|
a76e9c4367
|
入库出库作业单调整
|
2026-04-27 09:47:32 +08:00 |
|
|
秦鸿展
|
60874e7322
|
物料导入分类问题解决
|
2026-04-22 22:44:39 +08:00 |
|
|
王奎兴
|
798e95521a
|
散租添加出账日;
|
2026-04-22 18:35:42 +08:00 |
|
|
秦鸿展
|
882aa8740e
|
bug更改
|
2026-04-22 15:21:36 +08:00 |
|
|
王奎兴
|
405bd43f34
|
发布正式修改配置;
|
2026-04-21 16:57:44 +08:00 |
|
|
王奎兴
|
f5451a51f0
|
Merge branch 'dev_WMS20260401' into dev
|
2026-04-21 16:56:36 +08:00 |
|
|
王奎兴
|
9a39d329e6
|
添加日志;
|
2026-04-21 16:15:35 +08:00 |
|
|
王奎兴
|
31f2bbcc8a
|
仓库添加是否启用;
|
2026-04-21 09:22:54 +08:00 |
|
|
秦鸿展
|
2c3ed1149a
|
1
|
2026-04-21 00:06:53 +08:00 |
|
|
秦鸿展
|
70936024a8
|
新建的仓库需要默认绑定当前登录账号
3.仓库绑定用户时只查询非默认用户IS_DEFAULT=1
|
2026-04-20 23:47:19 +08:00 |
|
|
王奎兴
|
951d2d98f5
|
发布测试配置修改;
|
2026-04-20 13:30:09 +08:00 |
|
|
秦鸿展
|
7f701ca701
|
物料管理（包装货主检验注释
|
2026-04-18 13:47:08 +08:00 |
|
|
秦鸿展
|
3d235e48f6
|
仓库修改
|
2026-04-17 19:31:04 +08:00 |
|
 赵辉
|
514cd7df61
|
Merge branch 'dev' into dev_WMS20260401
|
2026-04-17 10:02:34 +08:00 |
|
|
秦鸿展
|
2c35c39e52
|
物料查询抄码显示修改
|
2026-04-16 13:35:03 +08:00 |
|
|
赵辉
|
4ca0f10e61
|
oms修改
|
2026-04-16 11:22:32 +08:00 |
|
|
王奎兴
|
22aef1d84d
|
Merge branch 'dev' into dev_WMS20260401
# Conflicts:
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
# mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
# mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
# mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/facade/IReceiptMaterialDetailService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
# mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockReceiptOrder/StockReceiptOrderApi.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java
# mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
# mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml
|
2026-04-15 18:48:55 +08:00 |
|