Commit Graph
49 Commits
Author SHA1 Message Date
zhaoqing c7e4ced035 sql 2026-06-04 16:03:31 +08:00
zhaoqing 4b64a184ab sql 2026-06-04 16:01:52 +08:00
zhaoqing 3626af0c05 sql 2026-06-04 16:00:50 +08:00
zhaoqing 5aba02d478 sql-增删改 2026-05-16 10:50:01 +08:00
王奎兴 206c85aaf7 Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java
2026-05-15 13:55:42 +08:00
zhaoqing 20e47e8cc4 sql 2026-05-15 13:49:25 +08:00
zhaoqing d11bd2226c sql推送人名称 2026-05-14 19:34:05 +08:00
zhaoqing 9d483e3cc1 sql 2026-05-14 17:19:33 +08:00
zhaoqing 7e2d1d14a4 sql修复 2026-05-14 16:04:53 +08:00
zhaoqing 73c1cb999f sql 2026-05-14 15:56:33 +08:00
zhaoqing 94fd0ddbb7 sql 2026-05-14 11:32:04 +08:00
zhaoqing b15fd4f105 sql 2026-05-13 19:49:25 +08:00
王奎兴 d4748995b9 出库单明细加字段; 2026-04-29 15:19:37 +08:00
王奎兴 7dd5508006 feign调用地址修改; 2026-04-22 19:03:04 +08:00
王奎兴 38fb1c8ce5 oms推送wms加结算币种业务员信息; 2026-04-22 16:52:40 +08:00
王奎兴 775dfecf9f 部门id改为字符串;修改库存推送oms; 2026-04-22 14:41:20 +08:00
王奎兴 3d5be9dd27 查询业务单号; 2026-04-21 17:56:27 +08:00
王奎兴 31f2bbcc8a 仓库添加是否启用; 2026-04-21 09:22:54 +08:00
zhaoqing 5b54f99b72 wms-sql 2026-04-17 09:22:50 +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
zhaoqing f89c948da4 wms 抄码实体类字段 2026-04-15 09:43:11 +08:00
zhaoqing 54113c88be wms sql字段 2026-04-15 09:14:21 +08:00
zhaoqing 6aee88748b 修改 wms 库存管理 页面查询和打印 2026-04-14 22:21:15 +08:00
zhaoqing 230edc73e4 wms 基础数据-物料管理 添加是否抄码 2026-04-14 10:30:41 +08:00
王奎兴 47245a7dee nc推送修改; 2026-04-14 08:52:18 +08:00
王奎兴 e9d4f699ee wms费用科目修改; 2026-04-11 15:35:16 +08:00
秦鸿展 bfb3c92678 20260409修改内容 2026-04-10 09:29:26 +08:00
王奎兴 6b28715eaf 出库单及明细加字段;sql; 2026-04-08 14:06:04 +08:00
王奎兴 c8aade107b sql整理; 2026-04-03 16:27:08 +08:00
王奎兴 21ae63e78d 查询显示科目单价; 2026-04-02 16:03:22 +08:00
王奎兴 35974b48c7 费用科目增加字段; 2026-04-02 14:07:46 +08:00
王奎兴 9378e2cd5b 调整库存方法整合; 2026-04-01 15:42:50 +08:00
王奎兴 6b49339c23 sql整理; 2026-04-01 13:53:48 +08:00
秦鸿展 9b08712b31 PC物料导入添加 2026-03-31 16:35:41 +08:00
秦鸿展 88a179c8c5 PC拣货尺寸字段查询修改 2026-03-31 13:39:50 +08:00
秦鸿展 a9d5dcd89d PC上架尺寸字段查询修改 2026-03-31 11:44:50 +08:00
王奎兴 5d9cf9f216 sql; 2026-03-28 16:12:58 +08:00
王奎兴 02d2603087 推送nc状态更新修改;新字段sql整理; 2026-03-28 10:20:10 +08:00
王奎兴 708d80bcd3 nc推送添加推送时间;nc动态获取组织; 2026-03-27 13:45:07 +08:00
秦鸿展 2b7a8d4173 barcodeSQL文件 2026-03-17 22:12:16 +08:00
秦鸿展 6e1d62c71f handover_task_order表sql 2026-03-17 13:32:57 +08:00
hjx 126a826513 执行单下发 2026-01-28 17:58:51 +08:00
hjx 8ea215c58c 通宇组装摘要修改 2026-01-14 23:45:54 +08:00
hjx a648c4a50d 应收账单科目修改 2026-01-14 22:01:21 +08:00
hjx abf2847475 科目信息修改 2026-01-14 14:56:25 +08:00
王奎兴 97330de8ba bug修复; 2025-12-13 20:48:24 +08:00
hjx 7efbe3d404 南歧nc65对接 2025-12-05 18:21:36 +08:00
hjx 73a2d7f1c9 南歧nc65对接 2025-12-02 20:48:25 +08:00
陈现府 8355431361 first commit 2025-11-20 10:45:16 +08:00