 shijing
|
435898afcb
|
feat:禅道146
|
2026-01-06 14:15:52 +08:00 |
|
shijing
|
7ef0c9a64b
|
feat:禅道143
|
2026-01-06 11:26:15 +08:00 |
|
shijing
|
1fb079c4ab
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-01-06 11:24:31 +08:00 |
|
shijing
|
5d201d27fe
|
fix:检验工序统计分析表头与检验表一致，并将产品名称（除了毛坯检测）只保留name
|
2026-01-06 11:24:28 +08:00 |
 caoqianming
|
a8f158935a
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-01-06 11:20:57 +08:00 |
|
caoqianming
|
8f6ef463b0
|
fix: 修改supplieraudit界面
|
2026-01-06 11:20:56 +08:00 |
|
shijing
|
2164aac5bd
|
feat:玻纤半成品入库时添加编号前缀
|
2026-01-05 14:00:00 +08:00 |
|
shijing
|
e77e6c716d
|
fix:排棒日志填写时，批次更新为棒的编号
|
2026-01-05 13:45:36 +08:00 |
|
shijing
|
037bda3b5f
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-01-04 16:11:31 +08:00 |
|
shijing
|
245dd1bf46
|
fix:打印机报错提示文案修改
|
2026-01-04 16:11:29 +08:00 |
 TianyangZhang
|
ec45398088
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2026-01-04 14:11:31 +08:00 |
|
TianyangZhang
|
42c009451e
|
feat：光芯OA-新增报价单审核功能
|
2026-01-04 14:11:28 +08:00 |
|
shijing
|
a8626b5cdc
|
fix:表头颜色调整
|
2026-01-04 14:05:17 +08:00 |
|
shijing
|
3e0fd5f447
|
fix:禅道287
|
2026-01-04 10:44:04 +08:00 |
|
shijing
|
001d9d68f7
|
fix:登录页忘记密码分项目展示
|
2026-01-04 09:00:47 +08:00 |
|
shijing
|
60ca063efe
|
feat:禅道258
|
2025-12-31 12:49:17 +08:00 |
|
shijing
|
b63013d9a7
|
fix:检验记录可撤回删除
|
2025-12-31 10:00:10 +08:00 |
|
shijing
|
d8899317a8
|
fix:
|
2025-12-31 09:30:23 +08:00 |
|
shijing
|
458c9a674d
|
fix:mlogb_check检验人回显
|
2025-12-30 15:22:01 +08:00 |
|
shijing
|
9171a58059
|
fix:库存管理出入库记录列表中按钮“撤销”改为“撤回”
|
2025-12-30 14:59:35 +08:00 |
|
shijing
|
3297fa5a93
|
feat:禅道237
|
2025-12-30 14:20:45 +08:00 |
|
shijing
|
591ebf185c
|
feat:禅道266
|
2025-12-30 13:45:07 +08:00 |
|
caoqianming
|
d3daab7ea8
|
feat: 标签打印支持ip传入
|
2025-12-30 10:43:40 +08:00 |
|
caoqianming
|
d87662ce33
|
feat: 打印机设置支持ip
|
2025-12-30 10:38:14 +08:00 |
|
shijing
|
f88e3d27c8
|
feat:车间物料按钮样式颜色改变
|
2025-12-30 09:44:12 +08:00 |
|
shijing
|
08a1dd1500
|
fix:玻纤日志列表去除row-click
|
2025-12-30 09:08:21 +08:00 |
|
shijing
|
9ba61cc473
|
fix:禅道271
|
2025-12-29 16:56:30 +08:00 |
|
shijing
|
fe464e6ba5
|
feat:禅道267
|
2025-12-29 16:32:51 +08:00 |
|
shijing
|
b6ccf46cba
|
fix:返工时获取qct修正
|
2025-12-29 16:27:10 +08:00 |
|
shijing
|
11f26a7e30
|
feat:禅道263
|
2025-12-29 15:34:56 +08:00 |
|
shijing
|
b115b511c0
|
feat:禅道265
|
2025-12-29 15:19:51 +08:00 |
|
shijing
|
a53c388ba9
|
feat：禅道239
|
2025-12-29 14:57:44 +08:00 |
|
shijing
|
1c93ad1514
|
feat:禅道244
|
2025-12-29 14:57:24 +08:00 |
|
shijing
|
478e0d04a3
|
fix:禅道238
|
2025-12-29 13:51:45 +08:00 |
|
shijing
|
473618307b
|
fix:返工日志检验表
|
2025-12-29 13:40:51 +08:00 |
|
shijing
|
33844efb7c
|
fix:“物料标签”统一改为“打签”
|
2025-12-29 13:38:35 +08:00 |
|
shijing
|
a3b12bad68
|
fix:成品和半成品无聊标签打印
|
2025-12-29 13:37:38 +08:00 |
|
shijing
|
d9daef3587
|
fix:禅道284
|
2025-12-29 10:45:24 +08:00 |
|
shijing
|
6a1c313bc1
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-29 10:29:40 +08:00 |
|
shijing
|
f2cc34cb4c
|
fix:qct检验表加一个“返修检验”类型
|
2025-12-29 10:29:37 +08:00 |
|
TianyangZhang
|
432172d2a1
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-26 16:28:55 +08:00 |
|
TianyangZhang
|
e5d1a340cf
|
feat: 人员交接审批
|
2025-12-26 16:28:53 +08:00 |
|
caoqianming
|
f3a8d392d4
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-26 16:27:31 +08:00 |
|
caoqianming
|
1058ad5105
|
feat: assetlogin部门选择树型
|
2025-12-26 16:27:30 +08:00 |
|
shijing
|
ff6a9ad2c6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-26 15:35:11 +08:00 |
|
shijing
|
a20e84a6e3
|
fix：bxerp检验保存后刷新列表信息
|
2025-12-26 15:35:09 +08:00 |
|
caoqianming
|
d19a980d2b
|
feat: 人员信息补充可填写身份证号
|
2025-12-26 14:27:23 +08:00 |
|
caoqianming
|
0d7d4766fc
|
feat: 优化设备列表显示
|
2025-12-26 14:14:00 +08:00 |
|
caoqianming
|
e1dfdae4fb
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-25 13:54:42 +08:00 |
|
caoqianming
|
81557cdd78
|
feat: 资产入库初步完成
|
2025-12-25 13:54:41 +08:00 |
|
TianyangZhang
|
d0d17a32e2
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-25 09:41:53 +08:00 |
|
TianyangZhang
|
58cc8076b3
|
feat:修改人员交接单
|
2025-12-25 09:41:52 +08:00 |
|
shijing
|
85ff05d22a
|
fix:玻纤输出物料批次打印时，wpr查询条件放到判断里面改正
|
2025-12-24 16:23:28 +08:00 |
|
shijing
|
ccadd4d37e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-24 16:03:24 +08:00 |
|
shijing
|
aad1383334
|
fix:玻纤批次打印分为四类（工序带板段号打印模板、排一次棒打印模板、脱模测量前工序打印模板、其他工序打印模板）
|
2025-12-24 16:03:23 +08:00 |
|
TianyangZhang
|
db2c5dc149
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-24 15:50:52 +08:00 |
|
caoqianming
|
824931b48c
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-24 15:41:00 +08:00 |
|
caoqianming
|
7749abd60b
|
feat: 添加assetlogin form
|
2025-12-24 15:40:58 +08:00 |
|
shijing
|
0adebe5fe4
|
fix:成品入库记录提交除了光芯是接收，其他暂时为提交
|
2025-12-24 14:03:27 +08:00 |
|
shijing
|
1e39856004
|
fix:20251224光子问题修改
|
2025-12-24 13:54:56 +08:00 |
|
shijing
|
7fa7a8ccfa
|
fix:成品入库时如果assembShow为true时，数量最大值限制取消
|
2025-12-24 13:49:34 +08:00 |
|
shijing
|
698edcea65
|
fix:总数位置调整
|
2025-12-24 13:28:06 +08:00 |
|
shijing
|
ced6d4cb58
|
fix:光芯合批时批次号可用一使用过的批次号
|
2025-12-24 13:22:34 +08:00 |
|
shijing
|
a179619519
|
fix:其他入库问题修改
|
2025-12-23 17:14:52 +08:00 |
|
shijing
|
bb25cc1c43
|
fix：快捷查询->入库检验的分页
|
2025-12-23 13:56:49 +08:00 |
|
shijing
|
11ebb98897
|
fix:paoaomian也和kaiaomian一样加入分批
|
2025-12-23 10:53:37 +08:00 |
|
TianyangZhang
|
836d3009b8
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-22 13:57:06 +08:00 |
|
shijing
|
a2e849640f
|
fix:分批时不是本批次的板段标记出来
|
2025-12-22 13:11:48 +08:00 |
|
shijing
|
4b9da28d5d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-22 10:23:18 +08:00 |
|
shijing
|
9b87e28eb6
|
fix:玻纤开凹面分批时类似喷码可多选
|
2025-12-22 10:23:16 +08:00 |
|
caoqianming
|
15603ce1bb
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-19 18:42:53 +08:00 |
|
caoqianming
|
919c2d453f
|
feat: 添加固定资产相关页面
|
2025-12-19 18:42:52 +08:00 |
|
shijing
|
399d64800e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-19 17:03:02 +08:00 |
|
shijing
|
533aba2d70
|
fix:禅道193
|
2025-12-19 17:02:59 +08:00 |
|
caoqianming
|
da665b164f
|
feat: 离职申请可以选择任何人
|
2025-12-19 15:47:57 +08:00 |
|
caoqianming
|
e6069242fe
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-19 15:46:33 +08:00 |
|
caoqianming
|
9806e264d8
|
feat: 优化xtselect
|
2025-12-19 15:46:31 +08:00 |
|
caoqianming
|
e5c80121d8
|
feat: base xtSelect change时抛出数据
|
2025-12-19 15:25:37 +08:00 |
|
shijing
|
a6d1b01702
|
fix:禅道174
|
2025-12-19 14:46:50 +08:00 |
|
shijing
|
2d4ea7fb1e
|
fix：禅道232
|
2025-12-19 14:45:50 +08:00 |
|
shijing
|
fd5254aee3
|
fix:禅道210
|
2025-12-19 14:44:49 +08:00 |
|
TianyangZhang
|
53f8e8f91b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-19 13:26:35 +08:00 |
|
TianyangZhang
|
cf5a784f64
|
feat: 增加字段校验
|
2025-12-19 13:26:33 +08:00 |
|
shijing
|
53e2d487bf
|
fix:排扳加工率，合格率纠正
|
2025-12-19 11:03:37 +08:00 |
|
shijing
|
71d5e9c56b
|
fix:运料出入库记录关闭详情后刷新列表页
|
2025-12-19 09:31:26 +08:00 |
|
shijing
|
981e87d386
|
fix:禅道224
|
2025-12-19 09:30:35 +08:00 |
|
shijing
|
32e076fd14
|
fix:管综合统计合并领料（库存领料和交接领料），添加工前检验，添加仓库库存，改动领管-终检合格率
|
2025-12-19 08:44:46 +08:00 |
|
shijing
|
18c1320a16
|
fix:mioitem_check物料编号左固定
|
2025-12-19 08:40:34 +08:00 |
|
shijing
|
434cf4bfda
|
fix:禅道249
|
2025-12-18 15:32:15 +08:00 |
|
shijing
|
49173d0028
|
fix:喷码分批时录入板段号不是该批次的显示并提示
|
2025-12-18 15:27:50 +08:00 |
|
shijing
|
733ef4c15e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-18 13:58:10 +08:00 |
|
shijing
|
d9557dfa7a
|
fix:禅道245
|
2025-12-18 13:58:08 +08:00 |
|
caoqianming
|
5626596d32
|
fix: table添加row-key
|
2025-12-18 11:28:40 +08:00 |
|
caoqianming
|
a7aeb252ff
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-18 11:28:25 +08:00 |
|
caoqianming
|
3ea51a514b
|
fix: 修改i18n出现的bug
|
2025-12-18 11:28:24 +08:00 |
|
shijing
|
30f677d119
|
fix:禅道166
|
2025-12-18 11:12:36 +08:00 |
|
shijing
|
fb428464c2
|
fix:析晶为null或这空时，不显示el-tag
|
2025-12-18 10:01:36 +08:00 |
|
shijing
|
90713c1dff
|
fix:混批加料扫码全局搜索，可以添加车间库存任意工段的板段
|
2025-12-18 09:39:44 +08:00 |
|
shijing
|
ae2e7172b6
|
fix:混批加料表单
|
2025-12-18 09:10:31 +08:00 |
|
shijing
|
b1e46f1bf3
|
fix:混批加料时传入mtype
|
2025-12-18 09:07:06 +08:00 |