曹鹏飞
|
81b9f5c7bb
|
fix(inventory): 修正批次号赋值及物料扫码逻辑错误
- 将InProduceOrderController中批次号赋值改为使用item.getBatchNo()
- 在bomService扫描类型判断后正确设置物料齐套状态isQiTao
- 根据物料编号匹配替换接收物料查询条件中的ID匹配为materialNo匹配
- 统一调整各Controller中获取扫描类型type的缩进格式
- 修正OutProduceController中获取扫描类型的位置及相关逻辑
- 优化TransferCompanyController更新仓储信息逻辑，避免空列表更新异常
- 调整SapService日志等级，SAP返回表打印改为trace，避免日志过多
- 修正WmsStructuralPackageOrderMapper.xml中字段别名factory_code为factory_no
|
2025-12-08 17:30:27 +08:00 |
|
曹鹏飞
|
cf142fe4ea
|
feat: bug-996 齐套管理主物料新增一个【状态】属性字段
|
2025-12-08 09:24:17 +08:00 |
|
曹鹏飞
|
bddbaaeb5e
|
feat: bug-996 齐套管理主物料新增一个【状态】属性字段
|
2025-12-04 16:29:36 +08:00 |
|
曹鹏飞
|
78f5224f67
|
feat(deliverOrder): 新增缺货零件收货状态及线下收货更新功能
- 在交付订单实体和VO中新增缺货零件是否收货字段quehuoReceived
- 在Mapper中添加quehuoReceived查询接口，判断缺货零件是否全部收货
- 实现服务层方法updateQuehuoReceived，用于更新缺货收货状态
- 结构包订单线下收货接口新增调用updateQuehuoReceived逻辑，确保状态同步更新
- 创建订单时默认quehuoReceived设为false
- 订单确认收货后更新对应deliverId的quehuoReceived状态
|
2025-12-04 14:13:02 +08:00 |
|
曹鹏飞
|
871aba36e5
|
Merge branch 'feature/bug-953' into develop
|
2025-12-02 17:06:06 +08:00 |
|
曹鹏飞
|
3d474f3e7d
|
feat: bug-953 PDA删除【钢构件上架】菜单，钢构件收货直接过账到SAP
|
2025-12-02 17:04:03 +08:00 |
|
曹鹏飞
|
c9cc53b9cd
|
fix(bin): 调整库存VO字段与SQL映射
- 移除BinInventoryVO中的id和materialNo字段
- 在SQL查询中为sum数量添加别名num以匹配VO字段
- 保持接口与数据库字段的一致性，修正映射错误
|
2025-12-02 16:17:29 +08:00 |
|
曹鹏飞
|
73c835f7ff
|
feat: 新增根据物料编码查询库位编号接口
|
2025-12-02 10:39:52 +08:00 |
|
曹鹏飞
|
3864f9fcf1
|
Merge branch 'feature/bug-935' into develop
|
2025-12-02 09:43:43 +08:00 |
|
曹鹏飞
|
0762d58582
|
feat: bug-935 钢结构订单缺件功能优化
|
2025-12-02 09:43:29 +08:00 |
|
曹鹏飞
|
ad53d14ec3
|
Merge branch 'feature/bug-935' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
# nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java
|
2025-12-01 18:11:30 +08:00 |
|
曹鹏飞
|
8a0074247d
|
feat: bug-953 PDA删除【钢构件上架】菜单，钢构件收货直接过账到SAP
|
2025-12-01 16:40:17 +08:00 |
|
曹鹏飞
|
9fbbd6188b
|
feat: bug-967 单据管理/质检单管理增加查询条件和报表导出功能
|
2025-12-01 14:38:51 +08:00 |
|
曹鹏飞
|
ade7669e21
|
feat: bug-962 普通物料送货单和钢构件送货单添加状态字段
|
2025-12-01 14:07:59 +08:00 |
|
曹鹏飞
|
6c79973c13
|
feat: bug-954 储位可视化管理页面
|
2025-12-01 13:55:46 +08:00 |
|
曹鹏飞
|
10b37eda16
|
feat: bug-935 钢结构订单缺件功能优化
|
2025-11-28 15:25:46 +08:00 |
|
曹鹏飞
|
172ddbc444
|
feat: 一些优化
|
2025-11-17 14:04:50 +08:00 |
|
曹鹏飞
|
7309136378
|
feat: 一些优化
|
2025-11-16 16:13:27 +08:00 |
|
曹鹏飞
|
fd7dea2786
|
出库添加齐套逻辑
|
2025-11-14 18:25:12 +08:00 |
|
曹鹏飞
|
54fd717f83
|
Merge branch 'feature/bug-883' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
# nflg-wms-starter/src/main/java/com/nflg/wms/starter/BaseController.java
|
2025-11-13 17:31:23 +08:00 |
|
曹鹏飞
|
e9da850ec3
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-13 17:25:42 +08:00 |
|
曹鹏飞
|
88717846a8
|
Merge branch 'feature/bug-890' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
# nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSearchQO.java
# nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceTicketVO.java
# nflg-wms-repository/src/main/resources/mapper/WmsOutProduceTicketMapper.xml
|
2025-11-12 14:48:06 +08:00 |
|
曹鹏飞
|
9e2b8d678c
|
Merge branch 'feature/bug-884' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InMaterialScanRecord.java
# nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java
# nflg-wms-starter/src/main/java/com/nflg/wms/starter/BaseController.java
|
2025-11-12 14:36:13 +08:00 |
|
曹鹏飞
|
59b2a4b92f
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-12 14:06:51 +08:00 |
|
曹鹏飞
|
cca3b41182
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-11 17:50:10 +08:00 |
|
曹鹏飞
|
a693a94d58
|
feat: bug-884 添加【副产品(拆解)入库】业务
|
2025-11-11 17:45:46 +08:00 |
|
曹鹏飞
|
3b6d708fc1
|
feat: bug-890 成品出入库相关业务单据拆分
|
2025-11-11 13:48:17 +08:00 |
|
曹鹏飞
|
af32692f93
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-11 09:43:19 +08:00 |
|
曹鹏飞
|
0233a1f387
|
feat: 一些优化
|
2025-10-22 10:11:53 +08:00 |
|
曹鹏飞
|
a5ab1f9538
|
feat: 一些优化
|
2025-10-21 18:10:22 +08:00 |
|
曹鹏飞
|
118a14831d
|
feat: 一些优化
|
2025-10-21 17:51:44 +08:00 |
|
曹鹏飞
|
41275bcb64
|
feat: 一些优化
|
2025-10-21 11:26:08 +08:00 |
|
曹鹏飞
|
6a074de6f9
|
feat: bug-838 工艺室提出的问题
|
2025-10-17 17:45:21 +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 |
|
曹鹏飞
|
dee8259e81
|
feat: 一些优化
|
2025-10-11 17:36:42 +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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
0a623b70e4
|
feat: 仓库搜索条件添加工厂编号
|
2025-10-09 15:08:13 +08:00 |
|
曹鹏飞
|
303cd1164e
|
fix: 修复零部件出库单查询出错的问题
|
2025-10-09 15:07:28 +08:00 |
|
曹鹏飞
|
0db65a862e
|
feat: 仓库搜索条件添加工厂编号
|
2025-10-09 14:07:15 +08:00 |
|
曹鹏飞
|
dda2f7e8ff
|
fix: 修复零部件出库单查询出错的问题
|
2025-10-09 14:03:18 +08:00 |
|
曹鹏飞
|
c3159f91fa
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-10-08 11:16:03 +08:00 |