 王奎兴
|
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 |
|
 秦鸿展
|
551c618820
|
出库导入修改
|
2026-04-15 17:47:48 +08:00 |
|
|
秦鸿展
|
be323e975a
|
导入修改
|
2026-04-15 17:10:44 +08:00 |
|
 zhou-hongcheng
|
0fac5143a7
|
抄码存入详情
|
2026-04-15 16:08:55 +08:00 |
|
|
王奎兴
|
662123cdb6
|
上架库存调整记录注释;
|
2026-04-15 15:35:38 +08:00 |
|
 zhaoqing
|
9e6357d6e6
|
wms 收货详情-条码打印
|
2026-04-15 15:24:39 +08:00 |
|
|
zhaoqing
|
ffa741d7ed
|
wms 入库管理-打印入库单
|
2026-04-15 13:51:05 +08:00 |
|
|
zhou-hongcheng
|
e5681bc510
|
抄码存入详情
|
2026-04-15 12:27:38 +08:00 |
|
|
秦鸿展
|
1fbdaaaf51
|
上架数量显示异常1
|
2026-04-15 10:56:04 +08:00 |
|
|
秦鸿展
|
fdb70db6f6
|
上架数量显示异常
|
2026-04-15 10:06:46 +08:00 |
|
|
zhaoqing
|
f89c948da4
|
wms 抄码实体类字段
|
2026-04-15 09:43:11 +08:00 |
|
|
zhaoqing
|
f56db21de4
|
wms 添加抄码实体类
|
2026-04-15 08:47:06 +08:00 |
|
|
zhaoqing
|
6aee88748b
|
修改 wms 库存管理 页面查询和打印
|
2026-04-14 22:21:15 +08:00 |
|
|
秦鸿展
|
f63917ed03
|
PDA收货上架修改内容
|
2026-04-14 21:36:50 +08:00 |
|
|
zhaoqing
|
76e82f635a
|
wms 库存管理-抄码商品对照表-打印页面查询
|
2026-04-14 20:52:03 +08:00 |
|
|
王奎兴
|
281bf9b965
|
出入库单oms;
|
2026-04-14 19:03:01 +08:00 |
|
|
zhaoqing
|
1fa6d88545
|
w 库存管理-抄码商品对照表
|
2026-04-14 17:22:52 +08:00 |
|
|
zhaoqing
|
d10d899a1c
|
wms-基础数据-物料管理 添加是否抄码
|
2026-04-14 15:51:43 +08:00 |
|
|
秦鸿展
|
aa0be69556
|
PDA收货修改内容
|
2026-04-14 15:06:50 +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 |
|
|
秦鸿展
|
9bf7a9c0c8
|
复核异常生成异常单
|
2026-04-11 15:35:07 +08:00 |
|
|
秦鸿展
|
b2720fa655
|
作业单页面调整修改BUG
|
2026-04-11 10:15:36 +08:00 |
|
|
秦鸿展
|
6d3eb75f5c
|
入库异常，入库作业单，出库异常详情查询
|
2026-04-10 16:20:01 +08:00 |
|
|
秦鸿展
|
69543777da
|
PDA复核内容修改
|
2026-04-10 14:46:28 +08:00 |
|
|
秦鸿展
|
bfb3c92678
|
20260409修改内容
|
2026-04-10 09:29:26 +08:00 |
|
|
秦鸿展
|
fd5e81e5ff
|
收货批次号修改Sheet Ref NO's
|
2026-04-09 10:29:14 +08:00 |
|
|
秦鸿展
|
f66b11622d
|
收货lot编码
|
2026-04-09 09:53:23 +08:00 |
|
 高正杨
|
25d77bdb66
|
Merge branch 'dev' into dev_WMS20260401
|
2026-04-09 09:39:09 +08:00 |
|
|
秦鸿展
|
37644a72f3
|
复核详情修改，复核确认，批量复核、取消BUG修改
|
2026-04-08 17:39:42 +08:00 |
|
|
王奎兴
|
d9e3b7cf2a
|
查询物料库存数量;
|
2026-04-08 15:57:47 +08:00 |
|
|
王奎兴
|
7ca0de7d76
|
承运商字段;
|
2026-04-08 14:09:33 +08:00 |
|
|
王奎兴
|
6b28715eaf
|
出库单及明细加字段;sql;
|
2026-04-08 14:06:04 +08:00 |
|
|
秦鸿展
|
add0621be0
|
复核查询详情修改
|
2026-04-08 10:05:28 +08:00 |
|
|
秦鸿展
|
a7e33200b4
|
入库单计划入库数量修改
|
2026-04-07 16:14:29 +08:00 |
|
|
秦鸿展
|
cf5f955868
|
复核页面修改调整
|
2026-04-07 15:59:40 +08:00 |
|
|
秦鸿展
|
cdb5d52b4d
|
收货确认时覆盖原来的收货数量，费用以当前页面提交的数据计算
|
2026-04-07 14:21:24 +08:00 |
|
|
秦鸿展
|
f5e364093e
|
入库单修改提示物料仓库控制信息不存在，去掉校验
|
2026-04-07 13:39:52 +08:00 |
|
|
秦鸿展
|
d3870556af
|
复核页面修整
|
2026-04-07 11:44:14 +08:00 |
|
|
秦鸿展
|
74cb6b1dd8
|
Merge branch 'refs/heads/dev' into dev_WMS20260401
# Conflicts:
# mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
|
2026-04-07 10:56:59 +08:00 |
|
|
秦鸿展
|
65ae591f86
|
复核页面调整修改
|
2026-04-07 10:53:26 +08:00 |
|
|
王奎兴
|
f49753b630
|
推送增加税率;
|
2026-04-03 17:30:29 +08:00 |
|
|
王奎兴
|
9e6ae389c2
|
配置文件修改;
|
2026-04-03 17:10:46 +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 |
|
|
高正杨
|
0afadd336c
|
启动报错修改；
|
2026-04-03 15:18:34 +08:00 |
|
|
王奎兴
|
1dab99f7c1
|
推送bms;
|
2026-04-03 15:03:27 +08:00 |
|