factory

Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

b500ad6615 feat: wpr添加对外编号字段 caoqianming 2025-06-25 18:19:16 +0800
f3263caed0 feat:: batch_gxerp添加count_pn_jgqbl caoqianming 2025-06-25 17:33:50 +0800
ab22415e0f feat: ofm 完善1 caoqianming 2025-06-25 17:29:46 +0800
31f4e2869d feat: sql查询有风险提示更完善 caoqianming 2025-06-25 11:23:59 +0800
43e9642917 fix: 光子get_alldata_with_batch 其他入库获取错误2 caoqianming 2025-06-24 14:34:14 +0800
c338509854 fix: 光子get_alldata_with_batch 人员获取错误2 caoqianming 2025-06-24 14:28:22 +0800
5dddbfef81 release: 2.7.2025062414 2.7.2025062414 caoqianming 2025-06-24 14:08:15 +0800
037008d7c9 fix: 光子get_alldata_with_batch 人员获取错误 caoqianming 2025-06-24 13:52:44 +0800
9ff72b2da1 fix: 光子get_alldata_with_batch优化2 caoqianming 2025-06-24 11:23:45 +0800
53972fd22a feat: 光子get_alldata_with_batch优化 caoqianming 2025-06-24 09:30:09 +0800
cb09cee753 feat: 添加行政管理App caoqianming 2025-06-24 08:47:22 +0800
b0df18f01a feat: cd 设置清空缓冲区2 caoqianming 2025-06-23 17:49:02 +0800
c5e4cc48a4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-06-23 17:00:41 +0800
8e33e084b4 feat: cd 设置清空缓冲区 caoqianming 2025-06-23 17:00:39 +0800
ce54f326ee Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-06-23 13:55:55 +0800
1242b3d43a feat:enm/service修改排班记录生成时间 zty 2025-06-23 13:55:53 +0800
108fe0ae9f feat: mlogbout单个产品不支持直接修改 caoqianming 2025-06-23 13:44:28 +0800
f0cacf6777 feat: mioitem添加material__type查询条件 caoqianming 2025-06-20 15:28:49 +0800
50bf3e78d4 release: 2.6.2025062015 2.6.2025062015 caoqianming 2025-06-20 15:20:49 +0800
307935cb16 fix: wpr不合格的话先save再创建wm.defect caoqianming 2025-06-20 13:28:55 +0800
3683ddbdeb Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-06-20 11:11:32 +0800
fec244765a fix: 该交接单不支持撤销的bug caoqianming 2025-06-20 11:11:31 +0800
6a5ec34ef8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-06-20 09:44:57 +0800
7942a5168b fix: wpm/service 优化煤粉热值获取方式 zty 2025-06-20 09:44:52 +0800
db2e8934ba feat: 增加交接撤回功能 caoqianming 2025-06-19 17:25:33 +0800
4f08374ca6 feat: mlogbin的bug caoqianming 2025-06-19 15:43:02 +0800
dce573f892 fix: mioitem price 计算bug caoqianming 2025-06-19 14:23:49 +0800
3b04bdf067 feat: mioitem返回mio数据 caoqianming 2025-06-19 14:11:24 +0800
741b64142b feat: mioitem添加单价字段 caoqianming 2025-06-19 10:37:09 +0800
25c1cce41a feat: materialsimpleserializer返回bin_number_main caoqianming 2025-06-18 16:30:41 +0800
8805237a44 feat: 物料增加主库位号 caoqianming 2025-06-18 16:29:38 +0800
a819566c23 fix: wmaterial添加can_handover字段 caoqianming 2025-06-18 10:56:39 +0800
6af708d4f0 feat: wmaterial添加can_handover字段 caoqianming 2025-06-18 10:31:35 +0800
39c86a14d5 release: 2.6.2025061715 2.6.2025061715 caoqianming 2025-06-17 15:39:39 +0800
8d6f2bfd20 fix: mlogbinupdate时的bug caoqianming 2025-06-17 08:36:48 +0800
2b039dd4f7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-06-16 17:43:18 +0800
1366f432ee feat: mlogbin的编辑与mlogbout的联动 caoqianming 2025-06-16 17:42:43 +0800
31421ca0aa feat: mlogb首次创建需要更新count_ok_full caoqianming 2025-06-15 22:19:52 +0800
95b10371b9 feat: 支持从wpr处获取切片数4 caoqianming 2025-06-13 16:36:51 +0800
a820d6803e feat: 支持从wpr处获取切片数3 caoqianming 2025-06-13 16:25:06 +0800
e774992d3a feat: workchain通过线程执行 caoqianming 2025-06-13 16:23:35 +0800
4955ad1f11 feat: 支持从wpr处获取切片数2 caoqianming 2025-06-13 16:23:07 +0800
ab0c962053 feat: mlogbin联动mlogbout caoqianming 2025-06-13 16:22:50 +0800
4bd6eab9f4 feat: mlogbin 和 update时cal_count_notok cal_mlog传False caoqianming 2025-06-13 15:56:43 +0800
b9a7138e72 feat: mlogbin 和 update时cal_count_notok caoqianming 2025-06-13 15:24:53 +0800
cf7673cd98 feat: 支持从wpr处获取切片数 caoqianming 2025-06-13 14:31:48 +0800
680608e16f fix: mlogserializer需要同步count_real caoqianming 2025-06-13 14:29:31 +0800
6d87a69d8d fix: cal_mlog_count_from_mlogb 需要传参触发 caoqianming 2025-06-13 11:23:02 +0800
c02bb6d3db fix: mlog 数值计算bug caoqianming 2025-06-13 09:03:43 +0800
dbad152218 fix: wmaterial get在传入query参数时完善can_do的逻辑 caoqianming 2025-06-12 10:37:19 +0800
bb56becb5d feat: ichat 添加workchain接口 caoqianming 2025-06-12 09:07:43 +0800
b3000b013f feat: utask添加优先级字段 caoqianming 2025-06-11 11:32:07 +0800
0719ef8f42 feat: gen_number_with_rule bug2 caoqianming 2025-06-11 11:02:50 +0800
fea3c320a9 feat: gen_number_with_rule bug caoqianming 2025-06-11 10:58:31 +0800
bfc37f69af feat: 优化get_tyy_data 2 caoqianming 2025-06-10 13:35:38 +0800
8efd28633c feat: 优化get_tyy_data caoqianming 2025-06-10 12:42:02 +0800
5e0c515929 feat: batch_gxerp添加加工前缺陷 caoqianming 2025-06-10 10:05:53 +0800
438d06af2f feat: 增加check_sql_safe 稳定性 caoqianming 2025-06-10 08:48:13 +0800
84690e7b54 feat: 放开出入库的物料匹配 caoqianming 2025-06-09 15:50:08 +0800
2e3e8f997c feat: 采购入库节点可复用2 caoqianming 2025-06-09 15:44:31 +0800
7d29b9c4eb feat: 采购入库节点可复用 caoqianming 2025-06-09 15:37:17 +0800
016ef53517 release: 2.6.2025060913 2.6.2025060913 caoqianming 2025-06-09 13:33:13 +0800
77c4c54eb1 feat: inm 和 wpm添加wpr number的查询条件 caoqianming 2025-06-09 13:31:46 +0800
11f06c36f7 feat: 优化设备采集cd caoqianming 2025-06-09 13:03:03 +0800
b9cad6bbd8 feat: get_tyy_data 不更新的bug caoqianming 2025-06-09 10:09:32 +0800
27b225face feat: mlogb cal_count_pn_jgqbl caoqianming 2025-06-06 17:44:19 +0800
b102b78b02 release: 2.6.2025060617 2.6.2025060617 caoqianming 2025-06-06 17:27:20 +0800
be5dc161de feat: mlogbw也进行mlogb.cal_count_notok() caoqianming 2025-06-06 17:25:39 +0800
53c9afbca9 fix: mlog 的cal_count_notok_full的bug 4 caoqianming 2025-06-06 17:11:00 +0800
519672ef3f fix: mlog 的cal_count_notok_full的bug 3 caoqianming 2025-06-06 16:50:24 +0800
6e93d7cd68 fix: mlog 的cal_count_notok_full的bug 2 caoqianming 2025-06-06 16:46:41 +0800
c2770eed57 fix: mlog 的cal_count_notok_full的bug caoqianming 2025-06-06 16:45:38 +0800
4cc28b3583 feat: cal_mlog_count_from_mlogb 添加count_ok_full caoqianming 2025-06-06 16:39:16 +0800
ff2b098210 feat: 优化batches_to caoqianming 2025-06-06 16:26:52 +0800
fa221218f9 feat: cal_count_notok 完全合格数有bug caoqianming 2025-06-06 15:58:33 +0800
bb9e2f337a feat: batch_gxerp 全工段查询 caoqianming 2025-06-06 10:48:19 +0800
7d0491ac24 fix: 光芯批次统计"尺寸检验_完全合格率" caoqianming 2025-06-05 14:16:41 +0800
dff602abd1 fix: 光芯批次统计错误 caoqianming 2025-06-05 14:01:01 +0800
60c484ee7f feat: cd BrokenPipeError时尝试再建立连接3 caoqianming 2025-06-05 13:39:24 +0800
facee9342c feat: cd BrokenPipeError时尝试再建立连接2 caoqianming 2025-06-05 11:15:16 +0800
370c905781 feat: cd BrokenPipeError时尝试再建立连接 caoqianming 2025-06-05 11:05:55 +0800
bd9d5a5dc2 feat: 获取到重复的缺陷项打日志 caoqianming 2025-06-05 10:50:17 +0800
f06ad961f7 feat: can_fix 排除维修完成品 caoqianming 2025-06-05 08:40:55 +0800
9d1af24994 fix: handover_submit batches获取bug2 caoqianming 2025-06-05 08:24:20 +0800
014b48e135 fix: update_mb_item在检验时只做负数校验 caoqianming 2025-06-04 16:40:33 +0800
265a15c9fc fix: handover_submit batches获取bug caoqianming 2025-06-04 15:23:19 +0800
9ede95a5d6 feat: batchst 添加first_time isnull筛选 caoqianming 2025-06-04 10:19:29 +0800
a34514160d feat: 获取first_time, last_time独立出一个方法 caoqianming 2025-06-04 10:05:06 +0800
e1eaa78b11 release: 2.6.2025060409 2.6.2025060409 caoqianming 2025-06-04 09:25:49 +0800
1f9800db16 fix: 自动生成物料bug caoqianming 2025-05-30 15:39:13 +0800
9e9501a065 fix: 优化 gen_material_out 防止自引用 caoqianming 2025-05-30 14:04:35 +0800
ec42e70118 fix: 优化 gen_number_with_rule caoqianming 2025-05-30 11:11:06 +0800
7429b7d5fb feat: 修改gen_number_with_rule 以获取的最后编号为准 caoqianming 2025-05-30 10:13:57 +0800
8994b39917 fix: batches_to_limit 获取bug caoqianming 2025-05-30 09:56:07 +0800
f689b7609c feat: handover拆批时校验批次号是否可用 caoqianming 2025-05-30 09:07:17 +0800
45e02eae5f feat: 优化batches_to以达到自然排序功能 caoqianming 2025-05-29 15:30:49 +0800
5d33301389 feat: batches_to 获取已指向的批次号 caoqianming 2025-05-29 15:08:42 +0800
ad5d8db283 feat: get_qct接口进行校验 caoqianming 2025-05-29 10:55:52 +0800
4cd4ba3c9d feat: get_tyy_data优化保持socket连接 caoqianming 2025-05-29 10:20:46 +0800
725a471fd8 fix: batchst reuse_node逻辑完善2 caoqianming 2025-05-29 10:16:23 +0800