 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 |
|
shijing
|
87fab76188
|
fix:性能检验析晶默认不选
|
2025-12-17 15:45:46 +08:00 |
|
shijing
|
163f46929e
|
fix:合并到本批次后传入new_wm
|
2025-12-17 14:32:12 +08:00 |
|
shijing
|
8b9d75367b
|
fix:去掉多余按钮
|
2025-12-17 14:31:32 +08:00 |
|
shijing
|
0252ee2361
|
fix:上盘平磨handoverbw展示添加多选
|
2025-12-17 13:35:10 +08:00 |
|
shijing
|
e9a1c6041d
|
fix:多选数组传参增加id
|
2025-12-17 13:34:30 +08:00 |
|
shijing
|
e0fa44f976
|
fix:入库记录有检验时添加检验提交状态
|
2025-12-17 09:39:49 +08:00 |
|
shijing
|
0f90a845d0
|
fix:
|
2025-12-17 08:42:32 +08:00 |
|
shijing
|
d2162924f8
|
fix:禅道223
|
2025-12-16 16:15:21 +08:00 |
|
shijing
|
882c6fa6a8
|
fix:
|
2025-12-16 14:46:38 +08:00 |
|
shijing
|
fb6785654e
|
fix:光芯入库第一次检验
|
2025-12-16 14:02:05 +08:00 |
|
shijing
|
beabebaadc
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-16 13:07:15 +08:00 |
|
shijing
|
4fcf3cace9
|
fix:加工统计
|
2025-12-16 13:07:13 +08:00 |
|
caoqianming
|
4bb44903fc
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-16 11:23:21 +08:00 |
|
caoqianming
|
793a151a18
|
feat: 维修记录初步完成
|
2025-12-16 11:23:20 +08:00 |
|
shijing
|
8cd885c641
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-16 10:02:06 +08:00 |
|
shijing
|
7bdbf585ea
|
fix:库存统计页面将物料查询框放到下面的库存出入库统计
|
2025-12-16 10:02:04 +08:00 |
|
TianyangZhang
|
dd6c769b86
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-16 09:23:09 +08:00 |
|
TianyangZhang
|
00f7a66620
|
feat: pum 人员需求页面
|
2025-12-16 09:23:09 +08:00 |
|
caoqianming
|
9f1f0dc860
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-16 09:03:59 +08:00 |
|
caoqianming
|
e71cb83559
|
fix: base xtSelect edit时不可弹出选择框
|
2025-12-16 09:03:58 +08:00 |
|
shijing
|
e9c0006ccf
|
fix:禅道231
|
2025-12-16 09:01:16 +08:00 |
|
shijing
|
0a707478f7
|
fix:表格导出完善（枚举情况）
|
2025-12-16 08:35:13 +08:00 |
|
shijing
|
0d4145551f
|
fix：出入库详情的table合计调整
|
2025-12-15 14:28:58 +08:00 |
|
shijing
|
92e7084a5a
|
fix:添加row-key
|
2025-12-15 11:32:05 +08:00 |
|
shijing
|
3ea9da8a7a
|
fix:光子去除无用文件
|
2025-12-15 11:21:39 +08:00 |
|
shijing
|
062b0af6bf
|
fix:生产入库选中批次号后数量消失问题修改
|
2025-12-15 11:19:35 +08:00 |
|
shijing
|
f43bb1ae8a
|
fix:光子综合统计
|
2025-12-15 11:18:33 +08:00 |
|
shijing
|
2a47776b8f
|
fix:table添加row-key
|
2025-12-15 11:18:13 +08:00 |
|
shijing
|
a899a534ab
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-15 10:47:54 +08:00 |
|
shijing
|
b65fc2c7be
|
Merge branch 'gzerp'
|
2025-12-15 10:47:49 +08:00 |
|
caoqianming
|
364f9320cb
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-15 10:28:41 +08:00 |
|
caoqianming
|
71e131c2cd
|
feat: 添加enpneed_form表
|
2025-12-15 10:28:38 +08:00 |
|
shijing
|
2aa98e34d4
|
fix:光芯改版交接
|
2025-12-15 09:41:21 +08:00 |
|
caoqianming
|
8c764d26b6
|
feat: process完善父子级显示
|
2025-12-12 16:03:43 +08:00 |
|
caoqianming
|
d1cf6b2afb
|
feat: 原route页面添加dag图
|
2025-12-12 13:59:08 +08:00 |
|
caoqianming
|
fcc36bf29b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-12 10:35:26 +08:00 |
|
caoqianming
|
966603c422
|
feat: 光子添加我的主页页面
|
2025-12-12 10:35:25 +08:00 |
|
caoqianming
|
9797b51ded
|
feat: base 添加ticketCount接口
|
2025-12-12 10:32:23 +08:00 |
|
TianyangZhang
|
a790793c5f
|
fix: bug--gx -修改 车辆预定时段
|
2025-12-11 10:47:07 +08:00 |
|
TianyangZhang
|
76aa788335
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-11 09:43:10 +08:00 |
|
TianyangZhang
|
42e1c56be4
|
fix: 修改tkx 班组对比
|
2025-12-11 09:43:08 +08:00 |
|
shijing
|
4ff175073d
|
fix:交接完善2
|
2025-12-10 14:43:59 +08:00 |
|
shijing
|
37b4fc5662
|
fix:交接完善1
|
2025-12-10 14:16:56 +08:00 |
|
shijing
|
413e5a8c17
|
覅下：废品库更改模式
|
2025-12-10 14:12:48 +08:00 |
|
shijing
|
066f1013c6
|
fix:checktable检测项类型补全
|
2025-12-10 14:07:09 +08:00 |
|
caoqianming
|
bc3e2d03fe
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-09 15:39:45 +08:00 |
|
caoqianming
|
c6110dd489
|
feat: cesium token更换
|
2025-12-09 15:39:18 +08:00 |
|
shijing
|
46acc0af45
|
fix:更新Cesium.Ion.defaultAccessToken
|
2025-12-08 17:06:03 +08:00 |
|
shijing
|
c59c15167d
|
原料废品库展示
|
2025-12-08 14:16:18 +08:00 |
|
shijing
|
8142fbf43a
|
fix:未定义字段添加
|
2025-12-08 14:15:52 +08:00 |
|
shijing
|
34a80119e6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-08 14:15:18 +08:00 |
|
shijing
|
a6ac97a906
|
fix:工序带板段号打印模板添加切片总数
|
2025-12-08 14:15:16 +08:00 |
|
TianyangZhang
|
d2b0ed6f67
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-08 10:03:29 +08:00 |
|
TianyangZhang
|
d4416d7c6e
|
fix:修改tkx 各个模块的环比增长率
|
2025-12-08 10:03:26 +08:00 |
|
caoqianming
|
75fbd857e7
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-05 18:35:31 +08:00 |
|
caoqianming
|
400b41ba87
|
feat: 调整主页配置
|
2025-12-05 18:35:30 +08:00 |
|
shijing
|
ee65f15665
|
fix:库存统计变更接口materialCount2
|
2025-12-05 15:09:56 +08:00 |
|
shijing
|
086c7a2a6b
|
fix:禅道218
|
2025-12-05 14:18:02 +08:00 |
|
shijing
|
1e4e7c0459
|
fix:禅道219
|
2025-12-05 13:44:13 +08:00 |
|
shijing
|
b52b99e122
|
fix:检验表列宽度调整
|
2025-12-05 13:39:28 +08:00 |
|
shijing
|
d79283f41e
|
fix:12.04光芯改动
|
2025-12-05 11:25:21 +08:00 |
|
shijing
|
8c712acfd9
|
fix:外协工段生产领料展示按钮
|
2025-12-05 09:35:40 +08:00 |
|
shijing
|
ea8b468da2
|
fix:出入库记录表单中选择添加筛选
|
2025-12-05 09:22:07 +08:00 |
|
shijing
|
1a323e7326
|
fix:inm库管人员查询条件更改
|
2025-12-04 16:29:26 +08:00 |
|
shijing
|
0fe3e273ae
|
fix:废品库使用工段模板
|
2025-12-04 15:39:45 +08:00 |
|
shijing
|
410e48a5d3
|
fix:玻纤日志中子工序问题修改
|
2025-12-04 15:39:10 +08:00 |
|
shijing
|
7d3b8d3b46
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-04 15:33:58 +08:00 |
|
shijing
|
52cfa8db22
|
fix:禅道175
|
2025-12-04 15:33:56 +08:00 |
|
TianyangZhang
|
2e54a33aaf
|
fix:修改凌源能管大屏 资源泄露问题
|
2025-12-04 15:29:40 +08:00 |
|
TianyangZhang
|
8ed0bd9d29
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-04 10:25:08 +08:00 |
|
shijing
|
b2ddc57179
|
fix:仓库执行人查询posts__code__contains: "inm"
|
2025-12-04 09:47:08 +08:00 |
|
shijing
|
04a468ee7e
|
fix:yuanliaofeipinku
|
2025-12-04 09:18:44 +08:00 |
|
shijing
|
554031e0bf
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-03 15:08:12 +08:00 |
|
shijing
|
f558d282b7
|
fix:禅道198
|
2025-12-03 15:08:10 +08:00 |
|
caoqianming
|
33094c8161
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-03 13:25:09 +08:00 |
|
caoqianming
|
d817601437
|
feat: base 优化工作流配置的参与人选择等
|
2025-12-03 13:25:08 +08:00 |
|
shijing
|
69c63eea06
|
fix:生产执行出入库记录
|
2025-12-03 13:17:27 +08:00 |
|
TianyangZhang
|
b25d87ea89
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-03 09:37:58 +08:00 |
|
TianyangZhang
|
d4f884b3b5
|
fix: 修改 专利 论文 平台 反存功能
|
2025-12-03 09:37:57 +08:00 |
|
shijing
|
bedc4b0d45
|
fix:玻纤日志子工序新增时报错修正
|
2025-12-03 09:32:20 +08:00 |
|
shijing
|
0708b2a2fa
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-03 09:31:13 +08:00 |
|
shijing
|
d17c602384
|
fix:玻纤日志输入详情扭转工段可新增wpr
|
2025-12-03 09:31:11 +08:00 |
|
caoqianming
|
d2f41f69ab
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-02 18:38:27 +08:00 |
|
caoqianming
|
988d693678
|
feat: base scTable queryData不clearSelection
|
2025-12-02 18:38:26 +08:00 |
|
shijing
|
76d3cc25cc
|
fix:库存统计修正
|
2025-12-02 17:02:13 +08:00 |
|
shijing
|
84562cfb37
|
fix:表格优化
|
2025-12-02 16:16:01 +08:00 |
|
shijing
|
aff4bcc201
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-02 16:15:45 +08:00 |
|
shijing
|
d346ee1598
|
fix:玻纤交接问题修改
|
2025-12-02 16:15:43 +08:00 |
|
TianyangZhang
|
815ba44b77
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-02 14:48:05 +08:00 |
|
TianyangZhang
|
5f57220a71
|
fix: 修改tkx precen && consume_precen 存在的bug
|
2025-12-02 14:48:02 +08:00 |
|
shijing
|
4f2162d496
|
fix:mioitem统计修正
|
2025-12-02 11:06:29 +08:00 |
|
shijing
|
13e32911ac
|
fix:表格优化
|
2025-12-02 11:03:53 +08:00 |
|
shijing
|
b2f0a4f74a
|
fix:喷码时可以选择设备
|
2025-12-02 11:01:26 +08:00 |
|
shijing
|
99f6c740c8
|
fix: 子工序操作记录更改
|
2025-12-01 16:49:27 +08:00 |
|
shijing
|
97c7172306
|
fix:玻纤勾选后点击“合批”后获取wpr列表展示
|
2025-12-01 14:33:21 +08:00 |
|
shijing
|
973d3485ed
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-01 14:23:20 +08:00 |
|
shijing
|
ccad811e32
|
fix:玻纤混批加料原理为改版，撤销变动（有可能是不同工段的板段合批）
|
2025-12-01 14:23:18 +08:00 |
|
caoqianming
|
61bfe8c21c
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-01 13:49:04 +08:00 |
|
caoqianming
|
15d3e64f02
|
fix: mroombooking在初始状态编辑时slot问题
|
2025-12-01 13:49:03 +08:00 |
|
shijing
|
22c8f79cc3
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-12-01 13:14:58 +08:00 |