Commit Graph

425 Commits

Author SHA1 Message Date
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
chengzhaofeng
3c5994af05 修改设备权限 2024-12-26 15:23:16 +08:00
syngna_qiao
54d6dbec92 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-26 14:52:25 +08:00
syngna_qiao
458cb0171e feat(POD): 新增客户订单标签附件页签 2024-12-26 14:52:17 +08:00
cccbc46e36 库存查询报表:
增加筛选框:物料类别(展示-Z023:白包  Z091:彩包)
和展示框字段:物料类别(展示-Z023:白包  Z091:彩包)
2024-12-26 14:25:37 +08:00
955c51c248 公司间出库报表增加可导出图片(二维码)到excel中 2024-12-26 13:58:19 +08:00
chengzhaofeng
5d582578e5 feat(pms):gateway 2024-12-26 13:15:56 +08:00
chengzhaofeng
0e4dfec86e Merge remote-tracking branch 'origin/dev' into dev 2024-12-26 13:15:33 +08:00
chengzhaofeng
89bb7da2ef feat(pms):添加pms-客制 2024-12-26 13:15:22 +08:00
syngna_qiao
e5aaf1eaa9 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-26 10:51:20 +08:00
syngna_qiao
11604eceb4 feat(客户标签自定义值配置): 新增标签PDF上传 2024-12-26 10:51:09 +08:00
luochen
0674d59f32 feat: 过程检验界面 列表中保存按钮修改 2024-12-26 10:11:28 +08:00
luochen
aac5ae9c5e feat: 过程检验界面 查询条件时间格式修改 2024-12-26 10:06:49 +08:00
luochen
04f7afb45b feat: 过程检验界面优化 2024-12-26 09:59:46 +08:00
luochen
25a42663fc feat: 过程检验界面优化 2024-12-25 20:11:40 +08:00
a4cb734f5f feat(托盘绑定):新增功能 2024-12-25 19:31:28 +08:00
580cbbe628 删除无效引入 2024-12-25 18:40:51 +08:00
angus liu
ad611a99af fix: PQC手动创建检验任务,调整页面繁体字问题 2024-12-25 17:37:38 +08:00
luochen
9ff033cbe6 feat: 过程检验界面优化 2024-12-25 17:14:18 +08:00
luochen
e16cd3f10e feat: 弹窗模糊查询 2024-12-25 16:34:49 +08:00
luochen
f96ded6ad1 feat: 弹窗模糊查询 2024-12-25 16:34:39 +08:00
6a36baad06 @change 2024-12-25 16:29:16 +08:00
syngna_qiao
8e7b837a42 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-12-25 14:26:54 +08:00
syngna_qiao
a39a598047 feat(打印): 补打优化可修改内容 2024-12-25 14:26:48 +08:00
755a38c4f8 1、采购到货登记的时候登记页面的仓库改为可选择(直接拉取wms_warehouse)
2、销售出货处理平台的单据放大镜(查询各种状态的单据)修改完影响到了所有的执行功能的放大镜
3、销售出货处理平台:送货单打印的物流单位置灰,不可修改
2024-12-25 14:02:57 +08:00
01170702f7 Merge remote-tracking branch 'origin/dev' into dev 2024-12-25 10:50:04 +08:00
2ecd4e4530 公司间出库报表的二维码内容增加物料 2024-12-25 10:49:59 +08:00
chengzhaofeng
feb9b8a173 Merge remote-tracking branch 'origin/dev' into dev 2024-12-25 10:18:52 +08:00