Commit Graph
153 Commits
Author SHA1 Message Date
王奎兴 39503f9f3c 日期时区问题修改; 2026-05-28 21:20:07 +08:00
王奎兴 ff5f078a78 配置修改; 2026-05-21 10:05:02 +08:00
王奎兴 e784dd289c 新正式环境配置; 2026-05-19 10:10:16 +08:00
赵辉 815ffc2a26 生产;环境feign修改 2026-05-08 20:22:59 +08:00
王奎兴 a8f9d21805 推送nc添加费用科目信息; 2026-04-28 14:42:31 +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
王奎兴 47245a7dee nc推送修改; 2026-04-14 08:52:18 +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
王奎兴 5849be8e8f wms费用科目bug修改;nc推送修改; 2026-04-13 15:14:48 +08:00
王奎兴 49d7c303a5 配置修改; 2026-03-28 17:12:59 +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
王奎兴 4bf9a5aa38 测试配置文件; 2026-03-27 17:04:46 +08:00
高正杨 6fd337268a nc启动报错; 2026-03-27 14:29:58 +08:00
王奎兴 260e853b12 nc推送添加推送时间;nc动态获取组织; 2026-03-27 14:01:22 +08:00
王奎兴 708d80bcd3 nc推送添加推送时间;nc动态获取组织; 2026-03-27 13:45:07 +08:00
hjx 62a84e8a19 配置文件改为正式 2026-03-26 15:51:53 +08:00
hjx 4bd55c8a4d nc添加南光 2026-03-26 14:48:18 +08:00
zhou-hongcheng 56a2749f7d 配置文件生产 2026-03-26 12:17:42 +08:00
王奎兴 4f879e3d5a bms2相关修改; 2026-03-18 23:27:24 +08:00
王奎兴 caf5adfc3e bms2相关修改; 2026-03-18 21:11:49 +08:00
王奎兴 93125d3c36 bms2相关修改; 2026-03-17 17:28:31 +08:00
王奎兴 9dafdfc051 生成账单费用合并; 2026-03-16 18:29:33 +08:00
王奎兴 0d61ae880b 生成账单费用合并; 2026-03-14 18:57:06 +08:00
王奎兴 e0d519d94a 测试配置修改; 2026-03-14 16:01:13 +08:00
王奎兴 2870e6729f bms2.0出账及发票修改; 2026-03-14 14:29:38 +08:00
王奎兴 b9c1821409 正式环境配置修改; 2026-03-11 16:37:55 +08:00
王奎兴 90136fc654 推送税率id; 2026-03-11 15:55:52 +08:00
王奎兴 9912271a7a 南起nc推送; 2026-03-11 11:05:20 +08:00
王奎兴 51fe38dfde 南起nc推送; 2026-03-10 23:43:47 +08:00
赵辉 cc17d1d0e2 Merge remote-tracking branch 'origin/dev' into dev 2026-03-10 23:16:29 +08:00
赵辉 eabbec3cc1 tms3.10修改 2026-03-10 23:08:27 +08:00
王奎兴 5be1ea50c2 查询条件; 2026-03-10 21:59:33 +08:00
王奎兴 9e3b087c9c nc推送billid加后缀; 2026-03-10 18:42:14 +08:00
王奎兴 2c806bc45a 按创建时间查询报错修改; 2026-03-10 18:24:49 +08:00
王奎兴 ed22a48de7 nc推送税额赋值修改; 2026-03-10 17:43:40 +08:00
王奎兴 df320e9bc4 nc推送结算币种取值修改; 2026-03-10 15:03:30 +08:00
赵辉 285816055e 应收账单审核 2026-03-09 23:28:59 +08:00
王奎兴 8483bc3d5e 批量出账; 2026-03-09 23:13:56 +08:00
王奎兴 5e28c10342 通宇推送nc; 2026-03-09 20:58:27 +08:00
赵辉 38b2868c35 应收账单审核 2026-03-06 21:26:25 +08:00
王奎兴 1f8085709b 应收账单添加 税额 无税费用; 2026-03-06 20:59:18 +08:00
王奎兴 78578046ae 发布测试修改配置; 2026-03-06 16:36:41 +08:00
赵辉 81adc97084 Merge remote-tracking branch 'origin/dev' into dev 2026-03-06 16:34:08 +08:00
赵辉 33a62a6a68 应收账单审核 2026-03-06 16:33:52 +08:00
王奎兴 41f7898d17 nc推送地址动态从三方接口获取; 2026-03-06 16:13:06 +08:00
王奎兴 006b1a43a2 nc推送地址动态从三方接口获取; 2026-03-06 16:09:06 +08:00