曹鹏飞
|
fc53443c9b
|
Merge branch 'feature/bug-935' into develop
|
2025-12-02 09:48:30 +08:00 |
|
曹鹏飞
|
6d0aad6ab4
|
feat: bug-935 钢结构订单缺件功能优化
|
2025-12-02 09:48:15 +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 |
|
曹鹏飞
|
0719fe337d
|
feat: bug-935 钢结构订单缺件功能优化
|
2025-12-01 18:08:27 +08:00 |
|
曹鹏飞
|
9cb6e1e2c3
|
refactor(structural-package): 优化钢构包订单相关数据处理
- 修正了托盘数量及重量累加的缩进格式
- 替换钢构包物料ID获取逻辑，改为使用PackageVO整体对象
- 在订单项中增加包号、包描述和包订单号字段设置
- 订单项中计算并设置托盘总重量字段
- 结构体DTO增加packageOrderNo、packageDesc、workbenchCode和weight字段
- workbenchCode通过modelNo与workbenchNo拼接生成
|
2025-12-01 17:59:00 +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 |
|
曹鹏飞
|
cc97b57f97
|
feat: bug-965 副产品入库单名称修改
|
2025-12-01 13:54:59 +08:00 |
|
曹鹏飞
|
f4e7abcf2b
|
feat: bug-966 返回字段添加批次号，数据为yyMMdd+4位流水号
|
2025-12-01 11:42:18 +08:00 |
|
曹鹏飞
|
101501516c
|
refactor(scan): 修改序列号字段名为serialNumbers并更新相关逻辑
- 将ScanCodeQO中serialNumber字段重命名为serialNumbers
- 更新ComponentOutboundController中序列号相关判断和赋值逻辑
- 修正InCostCenterBackController和OutCostCenterController中序列号字段映射
- 修改SapService中生成映射时使用serialNumbers字段
- 确保确认PDA方法参数格式统一调整
- 保持所有涉及序列号比较和处理的代码一致使用serialNumbers字段名
|
2025-12-01 11:24:28 +08:00 |
|
曹鹏飞
|
188043c6b5
|
fix: 修复生产订单入库单位未设置导致提交SAP报错的问题
|
2025-11-28 15:57:46 +08:00 |
|
曹鹏飞
|
10b37eda16
|
feat: bug-935 钢结构订单缺件功能优化
|
2025-11-28 15:25:46 +08:00 |
|
曹鹏飞
|
6e0f207e1e
|
feat: bug-937 钢构包送货单打印模板中的备注字段取消取值
|
2025-11-25 15:51:57 +08:00 |
|
曹鹏飞
|
5ad04bd10e
|
feat: bug-841 钢结构订单批量导入功能及非采购订单关联的订单
|
2025-11-25 15:49:38 +08:00 |
|
曹鹏飞
|
4b5f2d1864
|
Merge branch 'feature/bug-841' into develop
|
2025-11-25 15:17:44 +08:00 |
|
曹鹏飞
|
efdccae817
|
feat: bug-841 钢结构订单批量导入功能及非采购订单关联的订单
|
2025-11-25 15:17:23 +08:00 |
|
曹鹏飞
|
08066941c8
|
feat: 一些优化
|
2025-11-25 13:53:40 +08:00 |
|
曹鹏飞
|
376f3c5323
|
fix: bug-928 成品订单入库（生产订单入库）清点件，入库后WMS库存没增加
|
2025-11-25 11:49:56 +08:00 |
|
曹鹏飞
|
268fbc3220
|
feat: 一些优化
|
2025-11-18 10:37:13 +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 |
|
曹鹏飞
|
136b14a74a
|
Merge branch 'feature/bug-883' into develop
|
2025-11-13 18:17:18 +08:00 |
|
曹鹏飞
|
6d3c1b388b
|
生产订单入库过账时，如果是清点件，则使用主物料信息过账
|
2025-11-13 18:17:07 +08:00 |
|
曹鹏飞
|
d48defea66
|
feat:处理合并问题
|
2025-11-13 17:42:17 +08:00 |
|
曹鹏飞
|
2f794b9972
|
feat:处理合并问题
|
2025-11-13 17:37:20 +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 |
|
曹鹏飞
|
75851272d3
|
Merge branch 'feature/bug-883' into develop
|
2025-11-12 14:33:17 +08:00 |
|
曹鹏飞
|
819de47012
|
Merge branch 'sit' into develop
|
2025-11-12 14:31:51 +08:00 |
|
曹鹏飞
|
4b228fa369
|
feat: bug-884 添加【副产品(拆解)入库】业务
|
2025-11-12 14:29:31 +08:00 |
|
曹鹏飞
|
59b2a4b92f
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-12 14:06:51 +08:00 |
|
曹鹏飞
|
578151527a
|
feat: bug-884 添加【副产品(拆解)入库】业务
|
2025-11-12 10:48:56 +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 |
|
曹鹏飞
|
6785e797a5
|
feat: bug-762 钢构件订单创建部分字段信息自动带出上一次的值
|
2025-11-10 10:23:36 +08:00 |
|
曹鹏飞
|
f796618f14
|
feat: 修复钢构件送货单excel在低版本wps中无法显示二维码的问题
|
2025-11-04 17:22:59 +08:00 |
|
曹鹏飞
|
5884572ac6
|
feat: 修复钢构件送货单excel在低版本wps中无法显示二维码的问题
|
2025-11-04 17:22:26 +08:00 |
|
曹鹏飞
|
6c060fbc17
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-10-27 11:16:25 +08:00 |
|
曹鹏飞
|
d38aa6433a
|
feat: bug-862 工厂间转储入库时PDA不校验【转入储位】必填
|
2025-10-27 11:14:56 +08:00 |
zhangke
|
85f1f17402
|
Merge branch 'develop' into dev_zhangke
|
2025-10-27 11:14:27 +08:00 |
|
zhangke
|
d238c8b7e2
|
零部件打包编辑的时候添加修改送货人和送货地址的内容
|
2025-10-27 11:14:11 +08:00 |
|
曹鹏飞
|
7e43292c8e
|
Merge branch 'develop' into sit
|
2025-10-24 18:03:29 +08:00 |