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

45647d2149 feat: 按个选入消耗时统计mlog数据优化 caoqianming 2025-07-07 11:08:29 +0800
28acc48768 feat: mlog添加操作时间校验 caoqianming 2025-07-07 10:44:31 +0800
30bb96cf6c feat: 按个选入消耗时统计mlog数据 caoqianming 2025-07-07 10:34:40 +0800
e57e087006 fix: 优化ana_wpr4 caoqianming 2025-07-04 22:17:02 +0800
33f79b5cc5 feat: 优化ana_wpr3 caoqianming 2025-07-04 20:14:58 +0800
14f3b215c4 feat: BatchSt.g_create取消传入check_mat caoqianming 2025-07-04 13:22:45 +0800
e9059c93bd feat: 优化ana_wpr2 caoqianming 2025-07-04 11:02:34 +0800
662bef04ab feat: 优化ana_wpr caoqianming 2025-07-04 10:51:22 +0800
403477afd0 feat: wpr_bxerp返回批号 caoqianming 2025-07-04 10:08:16 +0800
1e128041cd fix: 日志多步骤导致的返工填写bug2 caoqianming 2025-07-04 08:50:03 +0800
433218feed fix: 日志多步骤导致的返工填写bug caoqianming 2025-07-04 08:35:46 +0800
e3067e115a feat: 获取该批次的DAG图数据支持仅直接关系 caoqianming 2025-07-03 14:54:20 +0800
79f1322c27 feat: 批次追踪链优化2 caoqianming 2025-07-03 14:38:16 +0800
17284dcf4f feat: 批次追踪链优化 caoqianming 2025-07-03 13:58:31 +0800
89aca50f44 fix: 正常交接收料工段与送料工段不能相同 caoqianming 2025-07-03 11:36:18 +0800
0284117297 release: 2.7.2025070310 2.7.2025070310 caoqianming 2025-07-03 11:01:01 +0800
dd5ef95fa4 feat: ana_wpr忽略模块导入错误 caoqianming 2025-07-03 10:57:10 +0800
1a621aca34 feat: 生产日志返回提交人姓名 caoqianming 2025-07-02 16:41:54 +0800
4b2bcc6d29 feat: 修改mlog_submit和mlog_revert以支持日志多个工艺步骤 caoqianming 2025-07-02 15:40:59 +0800
1d840e7c9d feat: 正常交接收料工段与送料工段不能相同 caoqianming 2025-07-02 10:46:11 +0800
e2f3c95748 feat: handover_revert自己交给自己无需处理 caoqianming 2025-07-02 10:38:01 +0800
864fb783dc fix: base ticket list 添加create_by_name caoqianming 2025-07-01 09:34:30 +0800
8a4ddd0307 feat: base ticket list 添加create_by_name caoqianming 2025-07-01 09:09:18 +0800
620e547da5 feat: 单日志支持多工艺步骤 caoqianming 2025-06-30 16:17:09 +0800
a3b0455fb4 feat: 单个统计的触发 caoqianming 2025-06-30 15:07:00 +0800
fdf717aecb fix: 针对未知bug先添加拦截校验 caoqianming 2025-06-30 09:41:08 +0800
a5e8fe3dde feat: wpr data字段数据库同步 caoqianming 2025-06-27 17:14:02 +0800
5ae9030152 feat: 优化wpr change_or_new caoqianming 2025-06-27 16:52:15 +0800
e86f4e79d4 feat: mlog添加cnumber查询条件 caoqianming 2025-06-27 16:49:50 +0800
76cdd08e9a fix: wpr change_or_new时根据number获取最后一个 caoqianming 2025-06-27 15:09:27 +0800
a0ed107491 fix: 出入库明细撤回bug caoqianming 2025-06-27 15:02:01 +0800
e6d8509971 feat: 出入库明细支持撤回并删除-在一个事务2 caoqianming 2025-06-27 13:34:38 +0800
c054095f94 feat: 出入库明细支持撤回并删除-在一个事务 caoqianming 2025-06-27 13:33:34 +0800
10b63cdad5 feat: 出入库明细支持撤回并删除2 caoqianming 2025-06-27 13:31:54 +0800
30379bdab5 feat: 出入库明细支持撤回并删除 caoqianming 2025-06-27 13:29:39 +0800
1bb449c0db feat: batch_gxerp添加count_notok caoqianming 2025-06-26 13:56:39 +0800
e25f392175 feat: handover_revert尝试支持全部撤回2 caoqianming 2025-06-26 11:02:29 +0800
c4cde1c5ea feat: handover_revert尝试支持全部撤回 caoqianming 2025-06-26 10:54:32 +0800
a6d53471fc fix: batch_gxerp添加count_pn_jgqbl 2 caoqianming 2025-06-26 09:14:52 +0800
d03f106055 feat: batch_gxerp 添加need_inout查询条件 caoqianming 2025-06-26 09:07:12 +0800
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