 zhangke
|
7761a841c7
|
Merge remote-tracking branch 'origin/dev_zhangke' into dev_zhangke
|
2025-10-11 23:25:28 +08:00 |
|
zhangke
|
210503269d
|
Update .gitignore for Mac environment: replace Windows Maven repository paths with Mac paths
|
2025-10-11 23:17:54 +08:00 |
|
zhangke
|
6a7eb68240
|
Update .gitignore to exclude D:/develop/soft directory
|
2025-10-11 23:15:00 +08:00 |
|
zhangke
|
ff0b7ff323
|
Add .gitignore to exclude all jar files except lib dependencies
|
2025-10-11 23:09:46 +08:00 |
zhangke
|
7b0734bb32
|
Merge branch 'develop' into dev_zhangke
|
2025-10-11 22:57:58 +08:00 |
|
zhangke
|
b606368669
|
1、零部件装车单和零部件出库单添加了冲销的功能
|
2025-10-11 22:57:41 +08:00 |
曹鹏飞
|
534451400f
|
Merge branch 'feature/bug-776' into develop
|
2025-10-11 18:06:19 +08:00 |
|
曹鹏飞
|
9b4e5d62f4
|
feat: bug-776 所有的出库操作扫码后流程需要调整
|
2025-10-11 18:06:10 +08:00 |
|
曹鹏飞
|
19d48c1cf2
|
feat: 一些优化
|
2025-10-11 17:37:10 +08:00 |
|
曹鹏飞
|
dee8259e81
|
feat: 一些优化
|
2025-10-11 17:36:42 +08:00 |
|
曹鹏飞
|
8c9c8cb515
|
feat: 一些优化
|
2025-10-11 16:40:59 +08:00 |
|
曹鹏飞
|
9be20e6a35
|
feat: 一些优化
|
2025-10-11 16:40:33 +08:00 |
|
曹鹏飞
|
df06e278f1
|
feat: bug-817 采购退库查询SAP的结果的工厂字段调整到表头
|
2025-10-11 16:26:52 +08:00 |
|
曹鹏飞
|
a194ebc294
|
feat: bug-817 采购退库查询SAP的结果的工厂字段调整到表头
|
2025-10-11 16:25:58 +08:00 |
|
曹鹏飞
|
e8cdf75359
|
feat: 一些优化
|
2025-10-11 15:22:38 +08:00 |
|
曹鹏飞
|
969c5eb8df
|
feat: 一些优化
|
2025-10-11 15:21:48 +08:00 |
|
曹鹏飞
|
0b9d3923b0
|
Merge branch 'feature/bug-815' into develop
|
2025-10-11 14:58:18 +08:00 |
|
曹鹏飞
|
f45a3f4ba1
|
feat: bug-815 厂内调拨单和工厂间调拨单功能调整
|
2025-10-11 14:58:04 +08:00 |
|
曹鹏飞
|
6789b81523
|
Merge branch 'feature/bug-813' into develop
|
2025-10-11 11:46:05 +08:00 |
|
曹鹏飞
|
99176cdca2
|
feat: bug-813 零部件打包详情查询接口返回工厂编号
|
2025-10-11 11:45:48 +08:00 |
|
曹鹏飞
|
0035ae3f6a
|
feat: bug-814 调整排序字段
|
2025-10-11 11:37:23 +08:00 |
|
曹鹏飞
|
c36fa6590d
|
Merge branch 'feature/bug-813' into develop
|
2025-10-11 11:20:22 +08:00 |
|
曹鹏飞
|
8a4e2de9d2
|
feat: bug-813 pda所有详情查询接口返回工厂编号
|
2025-10-11 11:20:06 +08:00 |
|
曹鹏飞
|
7dfa50c084
|
feat: bug-813 零部件打包详情查询接口返回工厂编号
|
2025-10-11 11:01:53 +08:00 |
|
曹鹏飞
|
309ec6bdba
|
feat: bug-802 生产补料单取消申请数量不能大于需求量的校验
|
2025-10-11 10:08:28 +08:00 |
|
曹鹏飞
|
f5ff21cdc1
|
feat: 增加校验
|
2025-10-11 10:07:20 +08:00 |
|
曹鹏飞
|
d4121b1e6d
|
Merge branch 'feature/bug-764' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
|
2025-10-10 17:07:49 +08:00 |
|
曹鹏飞
|
0b399d3ef6
|
feat: bug-764 扫码记录的时间格式化
|
2025-10-10 17:06:08 +08:00 |
|
曹鹏飞
|
555b4792ba
|
feat: bug-789 成本中心领料(退料）单据新增,搜索条件添加【单号】
|
2025-10-10 14:19:14 +08:00 |
|
曹鹏飞
|
6226770de9
|
Merge branch 'feature/bug-788' into develop
|
2025-10-10 10:14:27 +08:00 |
|
曹鹏飞
|
3fa3afdbd4
|
Merge branch 'feature/bug-784' into develop
|
2025-10-10 10:14:16 +08:00 |
|
曹鹏飞
|
40d8de59b6
|
feat: bug-784 钢构包订单添加缺件交货的功能
|
2025-10-10 10:14:04 +08:00 |
|
曹鹏飞
|
314a5303a5
|
feat: bug-788 库存物料条码打印问题修改
|
2025-10-10 10:13:15 +08:00 |
|
曹鹏飞
|
f877f48f9d
|
Merge branch 'feature/bug-788' into develop
|
2025-10-10 09:40:26 +08:00 |
|
曹鹏飞
|
f5a0983aa5
|
feat: 入库记录添加工厂、仓位、储位数据
|
2025-10-09 17:59:56 +08:00 |
|
曹鹏飞
|
02e02977fa
|
feat: bug-788 库存物料条码打印问题修改
|
2025-10-09 16:01:37 +08:00 |
|
曹鹏飞
|
88a71210e1
|
fix: 修复成本中心领料出库时库存查询的仓库未设置为请求参数的仓库信息的问题
|
2025-10-09 15:10:50 +08:00 |
|
曹鹏飞
|
0a623b70e4
|
feat: 仓库搜索条件添加工厂编号
|
2025-10-09 15:08:13 +08:00 |
|
曹鹏飞
|
303cd1164e
|
fix: 修复零部件出库单查询出错的问题
|
2025-10-09 15:07:28 +08:00 |
|
曹鹏飞
|
ab9af970ea
|
fix: 修复成本中心领料出库时库存查询的仓库未设置为请求参数的仓库信息的问题
|
2025-10-09 15:06:56 +08:00 |
|
曹鹏飞
|
0db65a862e
|
feat: 仓库搜索条件添加工厂编号
|
2025-10-09 14:07:15 +08:00 |
|
曹鹏飞
|
dda2f7e8ff
|
fix: 修复零部件出库单查询出错的问题
|
2025-10-09 14:03:18 +08:00 |
|
曹鹏飞
|
f86b8b0f7f
|
Merge branch 'feature/bug-787' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
|
2025-10-09 13:54:58 +08:00 |
|
曹鹏飞
|
b1bdf8cbb8
|
feat: bug-787 生成物料二维码缺少供应商字段导致数据错误
|
2025-10-09 13:51:04 +08:00 |
|
曹鹏飞
|
6f064ce6e0
|
Merge branch 'feature/bug-776' into develop
|
2025-10-09 11:58:19 +08:00 |
|
曹鹏飞
|
119e867890
|
feat: bug-776 所有的出库操作扫码后流程需要调整
|
2025-10-09 11:57:55 +08:00 |
|
曹鹏飞
|
f88e725683
|
Merge branch 'feature/bug-776' into develop
|
2025-10-08 11:19:00 +08:00 |
|
曹鹏飞
|
c3159f91fa
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-10-08 11:16:03 +08:00 |
|
曹鹏飞
|
f008989a1c
|
Merge branch 'feature/bug-784' into develop
|
2025-10-08 11:15:38 +08:00 |
|
曹鹏飞
|
6a02cb9270
|
feat: bug-784 钢构包订单添加缺件交货的功能
|
2025-10-08 11:13:20 +08:00 |