Commit Graph
184 Commits
Author SHA1 Message Date
王奎兴 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
王奎兴 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
秦鸿展 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
王奎兴 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