Commit Graph

97 Commits

Author SHA1 Message Date
6046f7ac8b Merge remote-tracking branch 'origin/dev' into dev 2024-11-20 13:50:42 +08:00
9b031dfa1a 采购到货登记修正 2024-11-20 13:50:33 +08:00
syngna_qiao
97c336de32 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-11-20 10:46:04 +08:00
syngna_qiao
37ac21d598 feat(pdc):数据收集录入 2024-11-20 10:45:57 +08:00
chengzhaofeng
e66e799f89 Merge remote-tracking branch 'origin/dev' into dev 2024-11-20 10:45:13 +08:00
chengzhaofeng
9ed4e4409f feat(wms-h):迁移 2024-11-20 10:37:52 +08:00
syngna_qiao
3350b34d5c Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-11-19 17:25:38 +08:00
syngna_qiao
332bf1b438 feat(pdc):数据收集主数据 2024-11-19 17:25:31 +08:00
fa2c4eee7f 采购到货登记 2024-11-19 14:36:44 +08:00
6d6bd5173e 采购到货登记 2024-11-19 08:50:09 +08:00
syngna_qiao
6e1f64e59a feat(操作面板):
1. 操作面板新增工单栏位
2024-11-18 21:12:29 +08:00
syngna_qiao
4959e2e64e feat(操作面板):
1. 操作面板新增工厂代码栏位
2. 设备增加按工厂代码过滤
3. 进站列表新增物料类别
4. 操作优化
2024-11-18 18:47:36 +08:00
syngna_qiao
8a94bcbd39 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-11-18 11:21:52 +08:00
syngna_qiao
99673da35a feat(操作面板):纳琳威操作面板 2024-11-18 11:21:35 +08:00
60a04e90c2 Merge remote-tracking branch 'origin/dev' into dev 2024-11-17 14:03:44 +08:00
350c2e8449 工单报工时过账日期从前端页面获取 2024-11-17 14:03:38 +08:00
554660a588 fix(工序出站):修改
refs:#43702
2024-11-16 16:28:29 +08:00
06ee899dc3 fix(工序出站):条码扫描修改
refs:#43702
2024-11-15 16:16:50 +08:00
luochen
17a4c403d7 feat: 检验计划 修改 2024-11-15 15:12:31 +08:00
luochen
61e3236b66 Merge remote-tracking branch 'origin/dev' into dev 2024-11-15 15:00:06 +08:00
luochen
9a4c5d4354 feat: 检验计划被使用后,检验对象不能编辑 2024-11-15 15:00:02 +08:00
2ab6533a81 Merge remote-tracking branch 'origin/dev' into dev 2024-11-15 14:48:51 +08:00
1baa98afeb 工单报工时过账日期从前端页面获取 2024-11-15 14:48:44 +08:00
luochen
a56e32cd57 feat: 检验类型=生产时,明细中有为计数/计量类型的,抽样规则提示不能为空的校验注释掉。抽样规则隐藏 2024-11-15 14:47:58 +08:00
9507394921 Merge remote-tracking branch 'origin/dev' into dev 2024-11-15 13:45:33 +08:00
403338b6ce 生产报工平台功能测试 2024-11-15 13:45:28 +08:00
76a456b363 fix(工序出站):作业规则维护工序以英文分号分割
refs:#43702
2024-11-15 11:14:29 +08:00
luochen
5fb398ffb3 feat: 检验类型=IQC时,主页面抽样规则必须填写,明细中抽样规则自动带主页面的数值不可修改。 2024-11-15 11:05:37 +08:00
syngna_qiao
5451b0fb7a Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-11-14 19:06:15 +08:00
syngna_qiao
96295c0177 feat(生产进站):新增进站列表显示字段
1. SALE_ORDER  :销售订单   长度:ZCT_CD  宽幅:ZCT_KF  这个几个取工单自定义字段;
2. 厚度:THICKNESS 取物料工单对应的计划物料自定义字段;
2024-11-14 19:06:05 +08:00
luochen
cebe5fc9c6 feat: 设备投料 界面修改 2024-11-14 18:23:43 +08:00
syngna_qiao
f7a2e72e2e feat(生产管理):编码规则-新 2024-11-14 18:12:52 +08:00
syngna_qiao
835df63e8b Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-11-14 17:29:08 +08:00
syngna_qiao
beda365098 feat(生产管理):编码规则-新 2024-11-14 17:28:13 +08:00
luochen
e37a931962 feat: 检验计划修改,检验类型=生产时 抽样规则隐藏 2024-11-14 15:41:25 +08:00
3ff976b949 修改生产报工管理平台页面增加工单报工取消功能 2024-11-14 14:35:37 +08:00
luochen
9602dc9504 feat: 检验任务作业 新增字段 2024-11-14 11:23:07 +08:00
094a238c3d 修改生产报工管理平台页面 2024-11-14 09:57:10 +08:00
syngna_qiao
badf4cd565 Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev 2024-11-13 20:36:20 +08:00
syngna_qiao
8143c9ba95 feat(生产管理):进站 2024-11-13 20:36:11 +08:00
ef70f32c16 fix(工序出站):增加查询字段
refs:#43702
2024-11-13 19:49:07 +08:00
luochen
7d4030ee49 feat: 上料 新增日志 2024-11-13 15:14:02 +08:00
luochen
996bd9dbe7 feat: 抽样规则 界面新增数量计算对象 2024-11-13 13:31:37 +08:00
da4ec0cce1 fix(工序出站):出站修改
refs:#43702
2024-11-13 11:29:16 +08:00
luochen
619b2455ab Merge remote-tracking branch 'origin/dev' into dev 2024-11-13 11:00:34 +08:00
luochen
3d91527269 feat: 检验频率 打开频率切换时添加频率切换列表 2024-11-13 11:00:26 +08:00
7997ae6c04 feat(设备-派工):新增设备-派工前台
refs: #43711
2024-11-13 10:59:10 +08:00
luochen
2067ef11c9 feat: 检验频率 新增字段 2024-11-13 10:23:27 +08:00
e31d62e963 feat(设备-派工):新增设备-派工前台
refs: #43711
2024-11-12 17:37:17 +08:00
luochen
0163099ca4 feat: mac测试发布地址 2024-11-12 17:16:12 +08:00