 yf001217
|
9194ec2d94
|
pdi回调修改
巡检工单流程修改
|
2026-06-16 14:40:33 +08:00 |
|
yf001217
|
c46114ccc5
|
Merge remote-tracking branch 'origin/qms/develop' into qms/develop
|
2026-06-16 08:33:10 +08:00 |
|
yf001217
|
c8ef39340e
|
pqc驳回修改
|
2026-06-16 08:32:47 +08:00 |
曹鹏飞
|
9eae751604
|
Merge remote-tracking branch '惠信/qms/develop' into qms/develop
|
2026-06-16 08:02:19 +08:00 |
|
曹鹏飞
|
63f62fd7bd
|
feat(barcode): 添加成本中心退料条码功能并支持PDF和图片导出
- 在BarCodeType常量中新增CostcenterBack类型用于成本中心退料
- 实现成本中心退料物料条码PDF导出功能，支持逐个和整页两种模式
- 添加物料标签图片ZIP批量导出功能，生成PNG格式二维码标签
- 集成条码生成逻辑，自动为退料项目创建对应的二维码主数据
- 使用模板引擎生成标准化的条码打印页面布局
- 实现ZIP压缩流处理，支持多文件打包下载功能
|
2026-06-16 08:02:05 +08:00 |
|
yf001217
|
39894531f5
|
Merge remote-tracking branch 'origin/qms/develop' into qms/develop
|
2026-06-15 23:03:05 +08:00 |
|
yf001217
|
ac55314af6
|
pqc驳回修改
|
2026-06-15 23:02:09 +08:00 |
|
曹鹏飞
|
f228433428
|
Merge remote-tracking branch '惠信/qms/develop' into qms/develop
|
2026-06-15 22:53:09 +08:00 |
|
曹鹏飞
|
d476cdf74a
|
fix(todo): 修复待办事项当前处理人显示逻辑
- 修改状态判断条件从不等于2改为小于2
- 添加来源类型判断分支
- 当来源类型为0时显示创建人姓名作为当前处理人
- 保持原有逻辑处理非0来源类型的查询方式
|
2026-06-15 22:52:41 +08:00 |
|
曹鹏飞
|
52cb2fd57b
|
Merge remote-tracking branch '惠信/qms/develop' into qms/develop
|
2026-06-15 22:48:55 +08:00 |
|
yf001217
|
248b6fe5a4
|
pqc驳回修改
|
2026-06-15 22:48:43 +08:00 |
|
yf001217
|
21b4e5b094
|
pdi、pqc驳回修改
|
2026-06-15 22:42:06 +08:00 |
|
曹鹏飞
|
243690b61a
|
Merge remote-tracking branch '惠信/qms/develop' into qms/develop
|
2026-06-15 21:50:11 +08:00 |
|
曹鹏飞
|
0b55fa9d1e
|
fix(barcode): 修复条码处理阶段状态及优化二维码生成逻辑
- 将条码处理阶段常量中的"已拒收"状态更正为"已越库"
- 注释掉生产订单控制器中重复的二维码批量保存逻辑
- 重构二维码获取方法，添加按项目获取二维码的逻辑并处理数量计算
- 修复SQL查询中COALESCE函数语法错误，确保锁定数量计算准确
- 调整质检任务排序规则，按检验状态和要求完成时间排序
- 注释掉工单处理中的消息推送逻辑避免重复通知
|
2026-06-15 21:50:02 +08:00 |
|
yf001217
|
8df7d080f1
|
pdi工单字段修改
|
2026-06-15 21:47:11 +08:00 |
|
yf001217
|
583851e10e
|
pdi工单待办/已办修改
|
2026-06-15 21:34:47 +08:00 |
|
yf001217
|
3b3f37703b
|
pdi工单关闭修改
|
2026-06-15 21:30:19 +08:00 |
|
yf001217
|
9250322266
|
pdi查询工单修改
|
2026-06-15 21:14:10 +08:00 |
|
yf001217
|
cfbb1f3e33
|
pdi提回调修改
|
2026-06-15 20:56:58 +08:00 |
|
yf001217
|
1125b4d9b7
|
pdi提交修改
|
2026-06-15 20:03:12 +08:00 |
|
yf001217
|
a21b9245f5
|
pdi提交修改字段
|
2026-06-15 19:53:34 +08:00 |
|
yf001217
|
94f9008e75
|
pdi查询新增字段
|
2026-06-15 18:57:00 +08:00 |
|
yf001217
|
efd3df65db
|
Merge remote-tracking branch 'origin/qms/develop' into qms/develop
|
2026-06-15 18:51:16 +08:00 |
|
曹鹏飞
|
8a0c901fe9
|
fix(qms): 修复质检数据更新逻辑
- 移除重复的收货项目更新操作
- 添加缺失的收货项目数据更新
- 添加收货主表数据更新
- 确保质检流程中的数据一致性
|
2026-06-15 17:46:13 +08:00 |
|
yf001217
|
ce5ddd8aad
|
Merge remote-tracking branch 'origin/qms/develop' into qms/develop
|
2026-06-15 17:34:14 +08:00 |
|
yf001217
|
7cafe589d3
|
巡检工单查询详情修改
|
2026-06-15 17:33:09 +08:00 |
|
曹鹏飞
|
f0eee8e2aa
|
Merge remote-tracking branch '惠信/qms/develop' into qms/develop
|
2026-06-15 17:13:40 +08:00 |
|
曹鹏飞
|
15102dd510
|
fix(inspection): 修复来料检验任务创建和回调处理中的字段映射错误
- 修复了新任务创建时materialId和inspectionStandardId字段的错误赋值
- 优化了不合格品数量判断逻辑，避免重复生成质检二维码记录
- 修正了待办事项中任务编号、类型和源ID的引用对象
- 重构了全检和抽检的处理流程，区分不同检测方法的任务回调逻辑
- 更新了WMS回调服务中不合格数量的计算方式，区分全检和抽检场景
- 修复了回调结果更新条件，确保初始状态的回调结果也能被正确更新
|
2026-06-15 17:13:35 +08:00 |
 zhangke
|
12332aa04f
|
Merge branch 'qms/develop' into qms/zhangke
|
2026-06-15 17:04:31 +08:00 |
|
zhangke
|
50182fd629
|
获取文件的时候，把字符串的img ID转换为 bigint类型
|
2026-06-15 17:04:18 +08:00 |
|
yf001217
|
a524e02e16
|
pqc工单修改
|
2026-06-15 16:23:11 +08:00 |
|
yf001217
|
3ef270bb02
|
巡检工单修改
|
2026-06-15 15:38:38 +08:00 |
|
yf001217
|
04ae6faceb
|
Merge remote-tracking branch 'origin/qms/develop' into qms/develop
|
2026-06-15 15:30:19 +08:00 |
|
yf001217
|
c82c48881a
|
pqc、巡检工单修改
|
2026-06-15 15:27:57 +08:00 |
|
曹鹏飞
|
3b39112245
|
Merge remote-tracking branch '惠信/qms/develop' into qms/develop
|
2026-06-15 15:16:14 +08:00 |
|
曹鹏飞
|
e17031c2ae
|
fix(qms): 修复COA审核逻辑和质检员查询参数问题
- 移除冗余的COA报告存在性检查逻辑，简化审核流程
- 修复XML映射文件中物料编号、分类代码和描述的参数引用错误
- 统一参数访问路径为request对象下的字段引用
|
2026-06-15 15:16:09 +08:00 |
|
yf001217
|
21ac284073
|
Merge branch 'qms/zhangke' into qms/develop
|
2026-06-15 14:59:45 +08:00 |
|
yf001217
|
6054c508e1
|
pqc工单修改
|
2026-06-15 14:58:46 +08:00 |
|
zhangke
|
1f8a6319f3
|
Merge branch 'qms/develop' into qms/zhangke
|
2026-06-15 14:57:39 +08:00 |
|
zhangke
|
1d9c480331
|
pdi 的检测任务添加检测规则ID；返回的检测项添加返回的图片信息
|
2026-06-15 14:57:23 +08:00 |
|
yf001217
|
b34823958d
|
Merge remote-tracking branch 'origin/qms/develop' into qms/develop
|
2026-06-15 14:47:47 +08:00 |
|
yf001217
|
71d8178fd7
|
工单修改
|
2026-06-15 14:47:23 +08:00 |
|
曹鹏飞
|
77b0f12912
|
Merge remote-tracking branch '惠信/qms/develop' into qms/develop
|
2026-06-15 14:25:57 +08:00 |
|
曹鹏飞
|
ff243b74da
|
fix(transfer): 修复调拨单据ID生成和订单关联问题
- 为WmsTransferCompanyItem和WmsTransferFactoryItem添加雪花算法ID生成
- 修复调拨公司和工厂控制器中的订单ID关联错误
- 移除多余的分号提高代码整洁性
|
2026-06-15 14:25:52 +08:00 |
|
yf001217
|
85e2ddb725
|
Merge branch 'qms/zhangke' into qms/develop
|
2026-06-15 14:23:00 +08:00 |
|
yf001217
|
e6aa5a0c25
|
pqc工单完成修改
|
2026-06-15 14:21:21 +08:00 |
|
zhangke
|
32b9492088
|
Merge branch 'qms/develop' into qms/zhangke
|
2026-06-15 14:20:13 +08:00 |
|
zhangke
|
3bd97a9ffa
|
PDI 根据部件名称搜索部件的检测结果
|
2026-06-15 14:19:55 +08:00 |
|
yf001217
|
4f2bd1e44c
|
Merge remote-tracking branch 'origin/qms/develop' into qms/develop
|
2026-06-15 13:53:27 +08:00 |
|
yf001217
|
2761613ae4
|
pqc工单完成修改
|
2026-06-15 13:53:00 +08:00 |