Commit Graph
163 Commits
Author SHA1 Message Date
秦鸿展 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
王奎兴 ac51afdb7e 发布正式配置修改; 2026-04-15 11:27:40 +08:00
zhaoqing d10d899a1c wms-基础数据-物料管理 添加是否抄码 2026-04-14 15:51:43 +08:00
zhaoqing f6a58fefe6 恢复 2026-04-14 15:27:55 +08:00
zhaoqing 230edc73e4 wms 基础数据-物料管理 添加是否抄码 2026-04-14 10:30:41 +08:00
王奎兴 5849be8e8f wms费用科目bug修改;nc推送修改; 2026-04-13 15:14:48 +08:00
王奎兴 e9d4f699ee wms费用科目修改; 2026-04-11 15:35:16 +08:00
王奎兴 d7b6394674 配置文件修改; 2026-04-03 16:29:08 +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
zhou-hongcheng 56a2749f7d 配置文件生产 2026-03-26 12:17:42 +08:00
王奎兴 2ebfd8eab9 推送单据修改;菜单查询优化; 2026-03-25 16:23:15 +08:00
王奎兴 8195dcd449 发票页面添加实际开票用户; 2026-03-24 13:29:50 +08:00
王奎兴 2977cdddb1 发票页面添加实际开票用户; 2026-03-24 13:22:35 +08:00
王奎兴 17abc106ca 定时推送账单添加执行日志; 2026-03-24 10:42:39 +08:00
王奎兴 a98bf7327f 定时推送账单添加执行日志; 2026-03-24 10:35:37 +08:00
王奎兴 9825b64016 定时推送账单添加执行日志; 2026-03-24 10:10:44 +08:00
王奎兴 3ceb01c07e 推送流水定时任务去除状态查询; 2026-03-23 17:08:38 +08:00
zhou-hongcheng d6e6e2dc7c 库位管理修改避免空指针 2026-03-19 14:12:12 +08:00
zhou-hongcheng c2d4ce9610 wms租赁推送到bms计费凭证 2026-03-19 14:02:42 +08:00
王奎兴 caf5adfc3e bms2相关修改; 2026-03-18 21:11:49 +08:00
王奎兴 d2f309af6b bms2相关修改; 2026-03-18 19:46:52 +08:00
王奎兴 e42b8d0ba9 bms2相关修改; 2026-03-18 19:34:00 +08:00
秦鸿展 8b36f8fb5c PDA盘点修改 2026-03-18 19:32:12 +08:00
王奎兴 8fea8fe98e bms2相关修改; 2026-03-18 19:07:42 +08:00
王奎兴 347c3dc4c7 bms2相关修改; 2026-03-18 17:41:08 +08:00
zhou-hongcheng 5f9504a4ce Merge remote-tracking branch 'origin/dev' into dev 2026-03-18 17:16:04 +08:00
zhou-hongcheng 099ede2693 维护条码信息 2026-03-18 17:15:27 +08:00
秦鸿展 1977f441c3 PC拣货任务集货位下发 2026-03-18 16:40:58 +08:00
zhou-hongcheng b2d65c734c 租赁时间 2026-03-18 15:33:55 +08:00
zhou-hongcheng f4cb9a5848 租赁增加字段 2026-03-18 10:45:54 +08:00
zhou-hongcheng 3ad35af34b 计费单据获取通用合同 2026-03-17 21:41:15 +08:00
zhou-hongcheng 91843478de Merge remote-tracking branch 'origin/dev' into dev 2026-03-17 17:43:22 +08:00
zhou-hongcheng cfc55a4ee5 租赁推送到bms租赁单据类型code 2026-03-17 17:43:05 +08:00
王奎兴 93125d3c36 bms2相关修改; 2026-03-17 17:28:31 +08:00
zhou-hongcheng 9b5075a6a9 租赁推送到bms合同查询查不到就查通用 2026-03-17 16:53:34 +08:00
zhou-hongcheng 1c582c0895 改为保留四位 2026-03-16 16:48:28 +08:00