 王奎兴
|
3241b0fce2
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
# Conflicts:
# mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
# mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
|
2026-04-18 14:27:49 +08:00 |
|
|
王奎兴
|
83ff6c46ca
|
oms入库单订单来源；
|
2026-04-18 14:27:06 +08:00 |
|
|
王奎兴
|
90aa6a0aeb
|
制单人;
|
2026-04-17 21:55:38 +08:00 |
|
|
王奎兴
|
c987ee31d6
|
库存调整记录添加入库单号 lotno;
|
2026-04-17 21:42:43 +08:00 |
|
|
王奎兴
|
05a999e2e1
|
上架添加库存修改;
|
2026-04-17 21:17:48 +08:00 |
|
|
王奎兴
|
9a895b8fba
|
库存调整记录修改;
|
2026-04-17 20:38:43 +08:00 |
|
|
王奎兴
|
5a2070bec9
|
上架报错;
|
2026-04-17 20:13:30 +08:00 |
|
|
王奎兴
|
b0fbbf7343
|
盘点结果推送oms;
|
2026-04-17 19:58:56 +08:00 |
|
|
王奎兴
|
a334c99180
|
入库结果回传oms;
|
2026-04-17 19:52:48 +08:00 |
|
|
王奎兴
|
90ede30b14
|
盘点推送结果oms;
|
2026-04-17 19:39:26 +08:00 |
|
|
王奎兴
|
d7cb562a9f
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-17 19:34:48 +08:00 |
|
|
王奎兴
|
19a1d192d5
|
盘点推送结果oms;
|
2026-04-17 19:34:33 +08:00 |
|
|
王奎兴
|
5ed590bfd2
|
查询出入库单审核状态;盘点推送结果oms;
|
2026-04-17 19:09:21 +08:00 |
|
|
王奎兴
|
89d78e3275
|
出入库前端生成单号;
|
2026-04-17 16:21:20 +08:00 |
|
|
王奎兴
|
4e62c80763
|
库存冻结体积面积信息;
|
2026-04-17 14:25:29 +08:00 |
|
|
王奎兴
|
5733e839ad
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-17 14:20:00 +08:00 |
|
|
王奎兴
|
f7ad272b8c
|
oms出入库;
|
2026-04-17 14:19:43 +08:00 |
|
|
王奎兴
|
f7434a592b
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-17 08:59:25 +08:00 |
|
|
王奎兴
|
ddc1f5d2ea
|
oms出入库;
|
2026-04-17 08:59:16 +08:00 |
|
|
王奎兴
|
5ee5dc28a5
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-16 11:21:41 +08:00 |
|
|
王奎兴
|
b561342bed
|
查询菜单报错;
|
2026-04-16 11:21:27 +08:00 |
|
|
王奎兴
|
eec90b054b
|
查询菜单报错;
|
2026-04-16 11:02:00 +08:00 |
|
|
王奎兴
|
e731394066
|
合并代码冲突;
|
2026-04-15 19:31:47 +08:00 |
|
|
王奎兴
|
e17216eb7c
|
合并代码冲突;
|
2026-04-15 19:30:05 +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 |
|
|
王奎兴
|
ad310f2fc2
|
oms修改;
|
2026-04-15 18:29:06 +08:00 |
|
|
王奎兴
|
662123cdb6
|
上架库存调整记录注释;
|
2026-04-15 15:35:38 +08:00 |
|
|
王奎兴
|
ac51afdb7e
|
发布正式配置修改;
|
2026-04-15 11:27:40 +08:00 |
|
|
王奎兴
|
7bc6843729
|
wms回传oms出入库结果;
|
2026-04-15 11:25:54 +08:00 |
|
|
王奎兴
|
281bf9b965
|
出入库单oms;
|
2026-04-14 19:03:01 +08:00 |
|
|
王奎兴
|
47245a7dee
|
nc推送修改;
|
2026-04-14 08:52:18 +08:00 |
|
|
王奎兴
|
0ee4ba6428
|
配置；
|
2026-04-13 17:54:21 +08:00 |
|
|
王奎兴
|
77879c31ff
|
nc
|
2026-04-13 17:47:46 +08:00 |
|
|
王奎兴
|
0f8e927cd2
|
发布测试配置修改;
|
2026-04-13 16:26:01 +08:00 |
|
|
王奎兴
|
bce84d0b4c
|
发布测试配置修改;
|
2026-04-13 16:21:10 +08:00 |
|
|
王奎兴
|
972c5042cf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-04-13 15:15:01 +08:00 |
|
|
王奎兴
|
5849be8e8f
|
wms费用科目bug修改;nc推送修改;
|
2026-04-13 15:14:48 +08:00 |
|
|
王奎兴
|
0a9e127d64
|
wms费用科目bug修改;
|
2026-04-11 17:19:37 +08:00 |
|
|
王奎兴
|
e9d4f699ee
|
wms费用科目修改;
|
2026-04-11 15:35:16 +08:00 |
|
|
王奎兴
|
42ec0ec4ad
|
入库oms;
|
2026-04-09 10:27:20 +08:00 |
|
|
王奎兴
|
2d3b1dfd0e
|
查询物料库存数量;
|
2026-04-08 16:12:15 +08:00 |
|
|
王奎兴
|
e68138a990
|
查询物料库存数量;
|
2026-04-08 16:08:54 +08:00 |
|
|
王奎兴
|
0a66cb4ba1
|
查询物料库存数量;
|
2026-04-08 16:06:20 +08:00 |
|
|
王奎兴
|
d9e3b7cf2a
|
查询物料库存数量;
|
2026-04-08 15:57:47 +08:00 |
|
|
王奎兴
|
bf9b441fbc
|
出库单新增字段查询;
|
2026-04-08 15:12:57 +08:00 |
|
|
王奎兴
|
7ca0de7d76
|
承运商字段;
|
2026-04-08 14:09:33 +08:00 |
|
|
王奎兴
|
6b28715eaf
|
出库单及明细加字段;sql;
|
2026-04-08 14:06:04 +08:00 |
|
|
王奎兴
|
dc2d33c1d7
|
查询入库单明细新字段;
|
2026-04-07 16:55:25 +08:00 |
|
|
王奎兴
|
c21a336c12
|
查询入库单明细新字段;
|
2026-04-07 16:45:06 +08:00 |
|
|
王奎兴
|
9a6cd617fb
|
查询入库单明细新字段;
|
2026-04-07 16:43:53 +08:00 |
|
|
王奎兴
|
300d6c3d8a
|
查询入库单明细新字段;
|
2026-04-07 16:35:20 +08:00 |
|
|
王奎兴
|
f49753b630
|
推送增加税率;
|
2026-04-03 17:30:29 +08:00 |
|
|
王奎兴
|
9e6ae389c2
|
配置文件修改;
|
2026-04-03 17:10:46 +08:00 |
|
|
王奎兴
|
d7b6394674
|
配置文件修改;
|
2026-04-03 16:29:08 +08:00 |
|
|
王奎兴
|
c8aade107b
|
sql整理;
|
2026-04-03 16:27:08 +08:00 |
|
|
王奎兴
|
4a155cc95a
|
推送bms重复问题;
|
2026-04-03 15:54:42 +08:00 |
|
|
王奎兴
|
01984812ed
|
收货列表查询金额;
|
2026-04-03 15:36:01 +08:00 |
|
|
王奎兴
|
b535ad9bc6
|
获取金额参数;
|
2026-04-03 15:28:37 +08:00 |
|
|
王奎兴
|
91368e7468
|
推送bms;
|
2026-04-03 15:03:47 +08:00 |
|
|
王奎兴
|
1dab99f7c1
|
推送bms;
|
2026-04-03 15:03:27 +08:00 |
|
|
王奎兴
|
843e69ee84
|
推送bms;
|
2026-04-03 15:02:41 +08:00 |
|
|
王奎兴
|
b1f304bc54
|
费用计算;
|
2026-04-03 13:50:51 +08:00 |
|
|
王奎兴
|
fb0de024f8
|
费用计算;
|
2026-04-03 09:56:49 +08:00 |
|
|
王奎兴
|
9210f49500
|
费用计算;
|
2026-04-03 09:50:17 +08:00 |
|
|
王奎兴
|
b34bb5ce36
|
费用计算;
|
2026-04-03 09:37:03 +08:00 |
|
|
王奎兴
|
e5fa261eda
|
费用计算;
|
2026-04-03 09:32:58 +08:00 |
|
|
王奎兴
|
11bca1f681
|
费用计算;
|
2026-04-03 09:26:26 +08:00 |
|
|
王奎兴
|
4fe5febdb0
|
费用计算;
|
2026-04-03 09:11:16 +08:00 |
|
|
王奎兴
|
92d252cbe0
|
费用科目按是否出入库显示查询及费用表;
|
2026-04-02 17:29:18 +08:00 |
|
|
王奎兴
|
ebb3d7c019
|
查询显示科目单价;
|
2026-04-02 16:20:22 +08:00 |
|
|
王奎兴
|
21ae63e78d
|
查询显示科目单价;
|
2026-04-02 16:03:22 +08:00 |
|
|
王奎兴
|
ba5137899f
|
修改是否显示字段;
|
2026-04-02 14:22:10 +08:00 |
|
|
王奎兴
|
35974b48c7
|
费用科目增加字段;
|
2026-04-02 14:07:46 +08:00 |
|
|
王奎兴
|
7f32271adc
|
调整库存和记录方法集合;
|
2026-04-02 13:59:50 +08:00 |
|
|
王奎兴
|
9f02532892
|
出库冻结添加调整记录;
|
2026-04-02 09:37:27 +08:00 |
|
|
王奎兴
|
9378e2cd5b
|
调整库存方法整合;
|
2026-04-01 15:42:50 +08:00 |
|
|
王奎兴
|
04875e1715
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-04-01 13:53:58 +08:00 |
|
|
王奎兴
|
6b49339c23
|
sql整理;
|
2026-04-01 13:53:48 +08:00 |
|
|
王奎兴
|
11196e7cf5
|
入库单加字段;
|
2026-04-01 13:37:36 +08:00 |
|
|
王奎兴
|
56b18885af
|
修改库存统一方法;查询动态表单配置返回修改;
|
2026-03-31 17:07:06 +08:00 |
|
|
王奎兴
|
a1cce28da5
|
拣货装卸费/贴标费;
|
2026-03-31 13:10:11 +08:00 |
|
|
王奎兴
|
8dda7c17b6
|
仓储动态表单;
|
2026-03-31 10:22:37 +08:00 |
|
|
王奎兴
|
580b103b85
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-03-31 09:31:37 +08:00 |
|
|
王奎兴
|
2af85ee22e
|
仓储动态表单;
|
2026-03-31 09:31:22 +08:00 |
|
|
王奎兴
|
49d7c303a5
|
配置修改;
|
2026-03-28 17:12:59 +08:00 |
|
|
王奎兴
|
37b3301ddd
|
动态按钮修改;
|
2026-03-28 16:54:47 +08:00 |
|
|
王奎兴
|
5d9cf9f216
|
sql;
|
2026-03-28 16:12:58 +08:00 |
|
|
王奎兴
|
99285fa122
|
按钮权限配置文件修改;
|
2026-03-28 14:35:34 +08:00 |
|
|
王奎兴
|
7790034fd0
|
bms1.0推送nc动态组织;
|
2026-03-28 10:42:09 +08:00 |
|
|
王奎兴
|
02d2603087
|
推送nc状态更新修改;新字段sql整理;
|
2026-03-28 10:20:10 +08:00 |
|
|
王奎兴
|
c6e3cb22f6
|
测试配置文件；
|
2026-03-27 17:06:37 +08:00 |
|
|
王奎兴
|
4bf9a5aa38
|
测试配置文件；
|
2026-03-27 17:04:46 +08:00 |
|
|
王奎兴
|
97424bcc33
|
角色配置按钮权限根据菜单查询按钮修改;
|
2026-03-27 16:49:16 +08:00 |
|
|
王奎兴
|
1c9fbf6622
|
角色配置按钮权限根据菜单查询按钮修改;
|
2026-03-27 16:49:04 +08:00 |
|
|
王奎兴
|
e7768babec
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-03-27 14:38:25 +08:00 |
|
|
王奎兴
|
b10fd44cc4
|
组织nc编码回显；
|
2026-03-27 14:38:11 +08:00 |
|
|
王奎兴
|
260e853b12
|
nc推送添加推送时间;nc动态获取组织;
|
2026-03-27 14:01:22 +08:00 |
|
|
王奎兴
|
708d80bcd3
|
nc推送添加推送时间;nc动态获取组织;
|
2026-03-27 13:45:07 +08:00 |
|
|
王奎兴
|
2ebfd8eab9
|
推送单据修改;菜单查询优化;
|
2026-03-25 16:23:15 +08:00 |
|
|
王奎兴
|
80d9167760
|
查询菜单类型;
|
2026-03-25 15:27:04 +08:00 |
|