Commit Graph

652 Commits

Author SHA1 Message Date
luochen
4edb8125f8 Merge remote-tracking branch 'origin/dev' into dev 2025-01-01 14:10:29 +08:00
luochen
cf5bc6314c feat: 品质复判 修改复判人 2025-01-01 14:10:14 +08:00
9d2f8e2eab fix(IQC检验任务):默认勾选个人任务单且不可编辑 2025-01-01 14:09:53 +08:00
luochen
3db220ba9a feat: 检验频率 隐藏不用的频率 2025-01-01 14:09:53 +08:00
luochen
abb5497731 feat: 过程检验 禁用个人检验任务复选框,图片删除 2025-01-01 14:09:06 +08:00
chengzhaofeng
2976deaedf Merge remote-tracking branch 'origin/dev' into dev 2024-12-31 18:29:17 +08:00
chengzhaofeng
b0ccd8d7e4 feat(盘点):盘点快照1.3 2024-12-31 18:27:00 +08:00
543d327471 整合服务中添加批量处理因为SAP帐期关闭要处理的逻辑 2024-12-31 18:08:47 +08:00
791f806b67 整合服务中添加批量处理因为SAP帐期关闭要处理的逻辑 2024-12-31 17:22:18 +08:00
luochen
d7f53b450f feat: 过程检验查询 检验人员群组开窗查询 2024-12-31 14:33:14 +08:00
54caf845eb SAP接口支持重抛 2024-12-31 13:22:17 +08:00
syngna_qiao
a18853d1a8 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-31 13:09:11 +08:00
syngna_qiao
2b95a2b6af feat(打印): 质检等级修改后标签内容变更重新打印 2024-12-31 13:09:01 +08:00
faramita
0b938ce0e7 fix(库存查询报表):补充导出物料类别参数 2024-12-31 11:19:42 +08:00
luochen
bb21f69037 feat: 过程检验查询前序不合格 新增检验任务界面隐藏检验细类 2024-12-31 10:17:29 +08:00
b5ebb51207 销售出货平台拣配单打印增加改名和备注字段 2024-12-30 14:27:46 +08:00
luochen
1662971197 feat: 手工创建检验任务,点击检验计划弹出框,需要多列能模糊查询
冻结/解冻 弹窗模糊查询
2024-12-30 13:14:56 +08:00
e4beeaf3f9 单据冲销 2024-12-30 09:51:56 +08:00
fc5af18835 fix(托盘绑定):新增字段 2024-12-29 18:26:36 +08:00
luochen
026a8eb0d8 feat: 生产入库单申请 时间选择框修改 2024-12-28 17:15:48 +08:00
61083aa210 代码全部提交 2024-12-28 16:41:05 +08:00
7c37432f9b fix(生产入库单申请):
1.单据预览问题
2024-12-28 16:35:52 +08:00
luochen
b0498be1b5 feat: 检验任务 界面重检修改,照片上传修改 2024-12-28 16:20:11 +08:00
0c0032931d feat(lot合批):新增逻辑
增加作业规则筛选一下可以看到的拆/合批次的工序作业规则:LOT_OPERATION,用于维护可以查看处理的工序
2024-12-28 16:19:53 +08:00
fa9a36d21c 增加单据冲销的页面 2024-12-28 15:32:11 +08:00
faramita
af9dd762f9 feat: 新增仓库库存汇总报表 2024-12-27 17:59:52 +08:00
c027767872 fix(手工打印取样标签):新增字段 2024-12-27 17:05:37 +08:00
syngna_qiao
d4baf9a932 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-27 15:43:05 +08:00
syngna_qiao
777650651f feat(打印): 客户标签附件 2024-12-27 15:42:59 +08:00
angus liu
55f165bd67 fix: IQC检验任务,再次修改优化,1.当检验值不存在时空指针异常修复,2.有些检验项目如配置了选填的,则可以不填,完成时不做校验优化 2024-12-27 14:47:37 +08:00
chengzhaofeng
6b7824031f Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-27 14:14:05 +08:00
chengzhaofeng
54da3c2a8a 设备台账修复1.2 2024-12-27 14:13:42 +08:00
syngna_qiao
3a0da01d34 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-27 13:39:06 +08:00
syngna_qiao
d1b674ea07 feat(打印): 客户标签自定义值集固定字段维护方式 2024-12-27 13:38:58 +08:00
775060edb3 fix(工序出站):扣料新增逻辑---当前设备是否属于附属设备,附属设备需要查询主设备(工单帮助框) 2024-12-27 13:26:20 +08:00
8621392f6b feat(Lot拆合批 、触发全检/抽检):
1. 合批和并批的功能配置在生产操作面板后,界面展示有问题;会错位
2.Lot No 调整成条码号:
2024-12-27 12:22:42 +08:00
6bf490f8a6 Merge remote-tracking branch 'origin/dev' into dev 2024-12-27 11:21:59 +08:00
d349f8f3c2 公司间入库报表取消单位的显示 2024-12-27 11:21:54 +08:00
542023c146 fix(工序出站):扣料新增逻辑---当前设备是否属于附属设备,附属设备需要查询主设备的投料 2024-12-27 11:13:06 +08:00
angus liu
8687e4941e fix: IQC检验任务,再次修改优化,改变检验任务不同判定结果和是否重验时,界面行颜色不同显示 2024-12-27 10:53:19 +08:00
syngna_qiao
89d9c4269f Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-27 10:33:02 +08:00
syngna_qiao
1d1cf51508 feat(PDC): PDC数据收集附加中物料非必填 2024-12-27 10:32:54 +08:00
chengzhaofeng
dfb99dbc7d Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-27 09:08:24 +08:00
chengzhaofeng
bf8c8a6a38 修复设备台账 2024-12-26 21:42:24 +08:00
syngna_qiao
f8459260b9 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-26 20:16:42 +08:00
syngna_qiao
922dc087cb feat(打印): 工序打印
1. 打印规则新增检验等级配置及匹配
2024-12-26 20:16:32 +08:00
cca041789d 修正公司间入库报表和交易入库部分存储数据字段调整 2024-12-26 19:17:49 +08:00
syngna_qiao
75a6b82af2 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-26 15:31:40 +08:00
syngna_qiao
f784af0714 fix(客户标签自定义值配置): 值集生成方式修改 2024-12-26 15:31:30 +08:00
chengzhaofeng
0aacfa2bc7 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-26 15:24:42 +08:00