Commit Graph

4092 Commits

Author SHA1 Message Date
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