 caoqianming
|
c3337cfa2a
|
feat: 导入daoru_mioitem_test单元格公式的处理
|
2025-07-15 10:21:29 +08:00 |
|
caoqianming
|
fc572d30e3
|
feat: ftestprocess update 支持新的检测项和缺陷项
|
2025-07-15 09:49:58 +08:00 |
|
caoqianming
|
528604d24f
|
fix: ftestprocess update 更详细的报错信息
|
2025-07-15 09:43:49 +08:00 |
|
caoqianming
|
5285bf0252
|
feat: ftestprocess update 更详细的报错信息
|
2025-07-15 09:42:03 +08:00 |
|
caoqianming
|
3fe723b397
|
feat: 数采做成单独服务
|
2025-07-14 13:42:29 +08:00 |
|
caoqianming
|
b8c799b938
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-07-14 10:53:24 +08:00 |
|
caoqianming
|
5a98d1bea7
|
feat: 测试cd
|
2025-07-14 10:48:31 +08:00 |
|
caoqianming
|
4b52c28b5e
|
fix: batchst并发创建的处理
|
2025-07-10 13:24:00 +08:00 |
|
caoqianming
|
e2c7847c74
|
feat: gen_number_with_rule 偏离6小时
|
2025-07-08 16:41:25 +08:00 |
|
caoqianming
|
024cae6fa3
|
feat: base complexquery value支持多种类型
|
2025-07-07 15:38:59 +08:00 |
|
caoqianming
|
523b4b2a42
|
feat: complexquery 支持isnull
|
2025-07-07 15:27:04 +08:00 |
|
caoqianming
|
d76d77fa49
|
feat: wpr 增加复杂查询接口
|
2025-07-07 14:49:57 +08:00 |
|
caoqianming
|
3858b3b9f9
|
feat: 返工不限制物料选择
|
2025-07-07 14:49:38 +08:00 |
|
caoqianming
|
05ebb25dc7
|
feat: 按个选入消耗时统计mlog数据优化2
|
2025-07-07 11:16:55 +08:00 |
|
caoqianming
|
45647d2149
|
feat: 按个选入消耗时统计mlog数据优化
|
2025-07-07 11:08:29 +08:00 |
|
caoqianming
|
28acc48768
|
feat: mlog添加操作时间校验
|
2025-07-07 10:44:31 +08:00 |
|
caoqianming
|
30bb96cf6c
|
feat: 按个选入消耗时统计mlog数据
|
2025-07-07 10:34:40 +08:00 |
|
caoqianming
|
e57e087006
|
fix: 优化ana_wpr4
|
2025-07-04 22:17:02 +08:00 |
|
caoqianming
|
33f79b5cc5
|
feat: 优化ana_wpr3
|
2025-07-04 20:14:58 +08:00 |
|
caoqianming
|
14f3b215c4
|
feat: BatchSt.g_create取消传入check_mat
|
2025-07-04 13:22:45 +08:00 |
|
caoqianming
|
e9059c93bd
|
feat: 优化ana_wpr2
|
2025-07-04 11:02:34 +08:00 |
|
caoqianming
|
662bef04ab
|
feat: 优化ana_wpr
|
2025-07-04 10:51:22 +08:00 |
|
caoqianming
|
403477afd0
|
feat: wpr_bxerp返回批号
|
2025-07-04 10:08:16 +08:00 |
|
caoqianming
|
1e128041cd
|
fix: 日志多步骤导致的返工填写bug2
|
2025-07-04 08:50:03 +08:00 |
|
caoqianming
|
433218feed
|
fix: 日志多步骤导致的返工填写bug
|
2025-07-04 08:35:46 +08:00 |
|
caoqianming
|
e3067e115a
|
feat: 获取该批次的DAG图数据 支持仅直接关系
|
2025-07-03 14:54:20 +08:00 |
|
caoqianming
|
79f1322c27
|
feat: 批次追踪链优化2
|
2025-07-03 14:38:16 +08:00 |
|
caoqianming
|
17284dcf4f
|
feat: 批次追踪链优化
|
2025-07-03 13:58:31 +08:00 |
|
caoqianming
|
89aca50f44
|
fix: 正常交接收料工段与送料工段不能相同
|
2025-07-03 11:36:18 +08:00 |
|
caoqianming
|
dd5ef95fa4
|
feat: ana_wpr忽略模块导入错误
|
2025-07-03 10:57:10 +08:00 |
|
caoqianming
|
1a621aca34
|
feat: 生产日志返回提交人姓名
|
2025-07-02 16:41:54 +08:00 |
|
caoqianming
|
4b2bcc6d29
|
feat: 修改mlog_submit和mlog_revert以支持日志多个工艺步骤
|
2025-07-02 15:40:59 +08:00 |
|
caoqianming
|
1d840e7c9d
|
feat: 正常交接收料工段与送料工段不能相同
|
2025-07-02 10:46:11 +08:00 |
|
caoqianming
|
e2f3c95748
|
feat: handover_revert自己交给自己无需处理
|
2025-07-02 10:38:01 +08:00 |
|
caoqianming
|
864fb783dc
|
fix: base ticket list 添加create_by_name
|
2025-07-01 09:34:30 +08:00 |
|
caoqianming
|
8a4ddd0307
|
feat: base ticket list 添加create_by_name
|
2025-07-01 09:09:18 +08:00 |
|
caoqianming
|
620e547da5
|
feat: 单日志支持多工艺步骤
|
2025-06-30 16:17:09 +08:00 |
|
caoqianming
|
a3b0455fb4
|
feat: 单个统计的触发
|
2025-06-30 15:07:00 +08:00 |
|
caoqianming
|
fdf717aecb
|
fix: 针对未知bug先添加拦截校验
|
2025-06-30 09:41:08 +08:00 |
|
caoqianming
|
a5e8fe3dde
|
feat: wpr data字段数据库同步
|
2025-06-27 17:14:02 +08:00 |
|
caoqianming
|
5ae9030152
|
feat: 优化wpr change_or_new
|
2025-06-27 16:52:15 +08:00 |
|
caoqianming
|
e86f4e79d4
|
feat: mlog添加cnumber查询条件
|
2025-06-27 16:49:50 +08:00 |
|
caoqianming
|
76cdd08e9a
|
fix: wpr change_or_new时根据number获取最后一个
|
2025-06-27 15:09:27 +08:00 |
|
caoqianming
|
a0ed107491
|
fix: 出入库明细撤回bug
|
2025-06-27 15:02:01 +08:00 |
|
caoqianming
|
e6d8509971
|
feat: 出入库明细支持撤回并删除-在一个事务2
|
2025-06-27 13:34:38 +08:00 |
|
caoqianming
|
c054095f94
|
feat: 出入库明细支持撤回并删除-在一个事务
|
2025-06-27 13:33:34 +08:00 |
|
caoqianming
|
10b63cdad5
|
feat: 出入库明细支持撤回并删除2
|
2025-06-27 13:31:54 +08:00 |
|
caoqianming
|
30379bdab5
|
feat: 出入库明细支持撤回并删除
|
2025-06-27 13:29:39 +08:00 |
|
caoqianming
|
1bb449c0db
|
feat: batch_gxerp添加count_notok
|
2025-06-26 13:56:39 +08:00 |
|
caoqianming
|
e25f392175
|
feat: handover_revert尝试支持全部撤回2
|
2025-06-26 11:02:29 +08:00 |
|
caoqianming
|
c4cde1c5ea
|
feat: handover_revert尝试支持全部撤回
|
2025-06-26 10:54:32 +08:00 |
|
caoqianming
|
a6d53471fc
|
fix: batch_gxerp添加count_pn_jgqbl 2
|
2025-06-26 09:14:52 +08:00 |
|
caoqianming
|
d03f106055
|
feat: batch_gxerp 添加need_inout查询条件
|
2025-06-26 09:07:12 +08:00 |
|
caoqianming
|
b500ad6615
|
feat: wpr添加对外编号字段
|
2025-06-25 18:19:16 +08:00 |
|
caoqianming
|
f3263caed0
|
feat:: batch_gxerp添加count_pn_jgqbl
|
2025-06-25 17:33:50 +08:00 |
|
caoqianming
|
ab22415e0f
|
feat: ofm 完善1
|
2025-06-25 17:29:46 +08:00 |
|
caoqianming
|
31f4e2869d
|
feat: sql查询有风险提示更完善
|
2025-06-25 11:23:59 +08:00 |
|
caoqianming
|
43e9642917
|
fix: 光子get_alldata_with_batch 其他入库获取错误2
|
2025-06-24 14:34:14 +08:00 |
|
caoqianming
|
c338509854
|
fix: 光子get_alldata_with_batch 人员获取错误2
|
2025-06-24 14:28:22 +08:00 |
|
caoqianming
|
037008d7c9
|
fix: 光子get_alldata_with_batch 人员获取错误
|
2025-06-24 13:52:44 +08:00 |
|
caoqianming
|
9ff72b2da1
|
fix: 光子get_alldata_with_batch优化2
|
2025-06-24 11:23:45 +08:00 |
|
caoqianming
|
53972fd22a
|
feat: 光子get_alldata_with_batch优化
|
2025-06-24 09:30:09 +08:00 |
|
caoqianming
|
cb09cee753
|
feat: 添加行政管理App
|
2025-06-24 08:47:22 +08:00 |
|
caoqianming
|
b0df18f01a
|
feat: cd 设置清空缓冲区2
|
2025-06-23 17:49:02 +08:00 |
|
caoqianming
|
c5e4cc48a4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-23 17:00:41 +08:00 |
|
caoqianming
|
8e33e084b4
|
feat: cd 设置清空缓冲区
|
2025-06-23 17:00:39 +08:00 |
 zty
|
ce54f326ee
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-23 13:55:55 +08:00 |
|
zty
|
1242b3d43a
|
feat:enm/service修改排班记录生成时间
|
2025-06-23 13:55:53 +08:00 |
|
caoqianming
|
108fe0ae9f
|
feat: mlogbout单个产品不支持直接修改
|
2025-06-23 13:44:28 +08:00 |
|
caoqianming
|
f0cacf6777
|
feat: mioitem添加material__type查询条件
|
2025-06-20 15:28:49 +08:00 |
|
caoqianming
|
307935cb16
|
fix: wpr不合格的话先save再创建wm.defect
|
2025-06-20 13:28:55 +08:00 |
|
caoqianming
|
3683ddbdeb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-20 11:11:32 +08:00 |
|
caoqianming
|
fec244765a
|
fix: 该交接单不支持撤销的bug
|
2025-06-20 11:11:31 +08:00 |
|
zty
|
6a5ec34ef8
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-20 09:44:57 +08:00 |
|
zty
|
7942a5168b
|
fix: wpm/service 优化煤粉热值获取方式
|
2025-06-20 09:44:52 +08:00 |
|
caoqianming
|
db2e8934ba
|
feat: 增加交接撤回功能
|
2025-06-19 17:25:33 +08:00 |
|
caoqianming
|
4f08374ca6
|
feat: mlogbin的bug
|
2025-06-19 15:43:02 +08:00 |
|
caoqianming
|
dce573f892
|
fix: mioitem price 计算bug
|
2025-06-19 14:23:49 +08:00 |
|
caoqianming
|
3b04bdf067
|
feat: mioitem返回mio数据
|
2025-06-19 14:11:24 +08:00 |
|
caoqianming
|
741b64142b
|
feat: mioitem添加单价字段
|
2025-06-19 10:37:09 +08:00 |
|
caoqianming
|
25c1cce41a
|
feat: materialsimpleserializer返回bin_number_main
|
2025-06-18 16:30:41 +08:00 |
|
caoqianming
|
8805237a44
|
feat: 物料增加主库位号
|
2025-06-18 16:29:38 +08:00 |
|
caoqianming
|
a819566c23
|
fix: wmaterial添加can_handover字段
|
2025-06-18 10:56:39 +08:00 |
|
caoqianming
|
6af708d4f0
|
feat: wmaterial添加can_handover字段
|
2025-06-18 10:31:35 +08:00 |
|
caoqianming
|
8d6f2bfd20
|
fix: mlogbinupdate时的bug
|
2025-06-17 08:36:48 +08:00 |
|
caoqianming
|
2b039dd4f7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-06-16 17:43:18 +08:00 |
|
caoqianming
|
1366f432ee
|
feat: mlogbin的编辑与mlogbout的联动
|
2025-06-16 17:42:43 +08:00 |
|
caoqianming
|
31421ca0aa
|
feat: mlogb首次创建需要更新count_ok_full
|
2025-06-15 22:19:52 +08:00 |
|
caoqianming
|
95b10371b9
|
feat: 支持从wpr处获取切片数4
|
2025-06-13 16:36:51 +08:00 |
|
caoqianming
|
a820d6803e
|
feat: 支持从wpr处获取切片数3
|
2025-06-13 16:25:06 +08:00 |
|
caoqianming
|
e774992d3a
|
feat: workchain通过线程执行
|
2025-06-13 16:23:35 +08:00 |
|
caoqianming
|
4955ad1f11
|
feat: 支持从wpr处获取切片数2
|
2025-06-13 16:23:07 +08:00 |
|
caoqianming
|
ab0c962053
|
feat: mlogbin联动mlogbout
|
2025-06-13 16:22:50 +08:00 |
|
caoqianming
|
4bd6eab9f4
|
feat: mlogbin 和 update时cal_count_notok cal_mlog传False
|
2025-06-13 15:56:43 +08:00 |
|
caoqianming
|
b9a7138e72
|
feat: mlogbin 和 update时cal_count_notok
|
2025-06-13 15:24:53 +08:00 |
|
caoqianming
|
cf7673cd98
|
feat: 支持从wpr处获取切片数
|
2025-06-13 14:31:48 +08:00 |
|
caoqianming
|
680608e16f
|
fix: mlogserializer需要同步count_real
|
2025-06-13 14:29:31 +08:00 |
|
caoqianming
|
6d87a69d8d
|
fix: cal_mlog_count_from_mlogb 需要传参触发
|
2025-06-13 11:23:02 +08:00 |
|
caoqianming
|
c02bb6d3db
|
fix: mlog 数值计算bug
|
2025-06-13 09:03:43 +08:00 |
|
caoqianming
|
dbad152218
|
fix: wmaterial get在传入query参数时完善can_do的逻辑
|
2025-06-12 10:37:19 +08:00 |
|
caoqianming
|
bb56becb5d
|
feat: ichat 添加workchain接口
|
2025-06-12 09:07:43 +08:00 |
|
caoqianming
|
b3000b013f
|
feat: utask添加优先级字段
|
2025-06-11 11:32:07 +08:00 |
|
caoqianming
|
0719ef8f42
|
feat: gen_number_with_rule bug2
|
2025-06-11 11:02:50 +08:00 |
|
caoqianming
|
fea3c320a9
|
feat: gen_number_with_rule bug
|
2025-06-11 10:58:31 +08:00 |
|
caoqianming
|
bfc37f69af
|
feat: 优化get_tyy_data 2
|
2025-06-10 13:35:38 +08:00 |
|
caoqianming
|
8efd28633c
|
feat: 优化get_tyy_data
|
2025-06-10 12:42:02 +08:00 |
|
caoqianming
|
5e0c515929
|
feat: batch_gxerp添加加工前缺陷
|
2025-06-10 10:05:53 +08:00 |
|
caoqianming
|
438d06af2f
|
feat: 增加check_sql_safe 稳定性
|
2025-06-10 08:48:13 +08:00 |
|
caoqianming
|
84690e7b54
|
feat: 放开出入库的物料匹配
|
2025-06-09 15:50:08 +08:00 |
|
caoqianming
|
2e3e8f997c
|
feat: 采购入库节点可复用2
|
2025-06-09 15:44:31 +08:00 |
|
caoqianming
|
7d29b9c4eb
|
feat: 采购入库节点可复用
|
2025-06-09 15:37:17 +08:00 |
|
caoqianming
|
77c4c54eb1
|
feat: inm 和 wpm添加wpr number的查询条件
|
2025-06-09 13:31:46 +08:00 |
|
caoqianming
|
11f06c36f7
|
feat: 优化设备采集cd
|
2025-06-09 13:03:03 +08:00 |
|
caoqianming
|
b9cad6bbd8
|
feat: get_tyy_data 不更新的bug
|
2025-06-09 10:09:32 +08:00 |
|
caoqianming
|
27b225face
|
feat: mlogb cal_count_pn_jgqbl
|
2025-06-06 17:44:19 +08:00 |
|
caoqianming
|
be5dc161de
|
feat: mlogbw也进行mlogb.cal_count_notok()
|
2025-06-06 17:25:39 +08:00 |
|
caoqianming
|
53c9afbca9
|
fix: mlog 的cal_count_notok_full的bug 4
|
2025-06-06 17:11:00 +08:00 |
|
caoqianming
|
519672ef3f
|
fix: mlog 的cal_count_notok_full的bug 3
|
2025-06-06 16:50:24 +08:00 |
|
caoqianming
|
6e93d7cd68
|
fix: mlog 的cal_count_notok_full的bug 2
|
2025-06-06 16:46:41 +08:00 |
|
caoqianming
|
c2770eed57
|
fix: mlog 的cal_count_notok_full的bug
|
2025-06-06 16:45:38 +08:00 |
|
caoqianming
|
4cc28b3583
|
feat: cal_mlog_count_from_mlogb 添加count_ok_full
|
2025-06-06 16:39:16 +08:00 |
|
caoqianming
|
ff2b098210
|
feat: 优化batches_to
|
2025-06-06 16:26:52 +08:00 |
|
caoqianming
|
fa221218f9
|
feat: cal_count_notok 完全合格数有bug
|
2025-06-06 15:58:33 +08:00 |
|
caoqianming
|
bb9e2f337a
|
feat: batch_gxerp 全工段查询
|
2025-06-06 10:48:19 +08:00 |
|
caoqianming
|
7d0491ac24
|
fix: 光芯批次统计"尺寸检验_完全合格率"
|
2025-06-05 14:16:41 +08:00 |
|
caoqianming
|
dff602abd1
|
fix: 光芯批次统计错误
|
2025-06-05 14:01:01 +08:00 |
|
caoqianming
|
60c484ee7f
|
feat: cd BrokenPipeError时尝试再建立连接3
|
2025-06-05 13:39:24 +08:00 |
|
caoqianming
|
facee9342c
|
feat: cd BrokenPipeError时尝试再建立连接2
|
2025-06-05 11:15:16 +08:00 |
|
caoqianming
|
370c905781
|
feat: cd BrokenPipeError时尝试再建立连接
|
2025-06-05 11:05:55 +08:00 |
|
caoqianming
|
bd9d5a5dc2
|
feat: 获取到重复的缺陷项 打日志
|
2025-06-05 10:50:17 +08:00 |
|
caoqianming
|
f06ad961f7
|
feat: can_fix 排除维修完成品
|
2025-06-05 08:40:55 +08:00 |
|
caoqianming
|
9d1af24994
|
fix: handover_submit batches获取bug2
|
2025-06-05 08:24:20 +08:00 |
|
caoqianming
|
014b48e135
|
fix: update_mb_item在检验时只做负数校验
|
2025-06-04 16:40:33 +08:00 |
|
caoqianming
|
265a15c9fc
|
fix: handover_submit batches获取bug
|
2025-06-04 15:23:19 +08:00 |
|
caoqianming
|
9ede95a5d6
|
feat: batchst 添加first_time isnull筛选
|
2025-06-04 10:19:29 +08:00 |
|
caoqianming
|
a34514160d
|
feat: 获取first_time, last_time独立出一个方法
|
2025-06-04 10:05:06 +08:00 |
|
caoqianming
|
1f9800db16
|
fix: 自动生成物料bug
|
2025-05-30 15:39:13 +08:00 |
|
caoqianming
|
9e9501a065
|
fix: 优化 gen_material_out 防止自引用
|
2025-05-30 14:04:35 +08:00 |
|
caoqianming
|
ec42e70118
|
fix: 优化 gen_number_with_rule
|
2025-05-30 11:11:06 +08:00 |
|
caoqianming
|
7429b7d5fb
|
feat: 修改gen_number_with_rule 以获取的最后编号为准
|
2025-05-30 10:13:57 +08:00 |
|
caoqianming
|
8994b39917
|
fix: batches_to_limit 获取bug
|
2025-05-30 09:56:07 +08:00 |
|
caoqianming
|
f689b7609c
|
feat: handover拆批时校验批次号是否可用
|
2025-05-30 09:07:17 +08:00 |
|
caoqianming
|
45e02eae5f
|
feat: 优化batches_to以达到自然排序功能
|
2025-05-29 15:30:49 +08:00 |
|
caoqianming
|
5d33301389
|
feat: batches_to 获取已指向的批次号
|
2025-05-29 15:08:42 +08:00 |
|
caoqianming
|
ad5d8db283
|
feat: get_qct接口进行校验
|
2025-05-29 10:55:52 +08:00 |
|
caoqianming
|
4cd4ba3c9d
|
feat: get_tyy_data优化保持socket连接
|
2025-05-29 10:20:46 +08:00 |
|
caoqianming
|
725a471fd8
|
fix: batchst reuse_node逻辑完善2
|
2025-05-29 10:16:23 +08:00 |
|
caoqianming
|
49efafcaff
|
fix: batchst reuse_node逻辑完善
|
2025-05-29 09:39:04 +08:00 |
|
caoqianming
|
82958e047b
|
fix: base ordering排序错误
|
2025-05-29 08:39:59 +08:00 |
|
caoqianming
|
70d80dafd2
|
feat: wmaterial提供canfix的tag查询
|
2025-05-28 16:30:50 +08:00 |