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

74581dc906 feat: base 将配置文件放到单独的config文件夹中防止误操作 caoqianming 2025-04-23 12:39:16 +0800
cbc667d50c release: 2.6.2025042311 2.6.2025042311 caoqianming 2025-04-23 12:24:27 +0800
ba9d7d041d release: 2.6.2025042311 caoqianming 2025-04-23 11:03:38 +0800
75503fc7e8 feat: 切分工序切分数量支持1 caoqianming 2025-04-23 10:59:59 +0800
433d85456e fix: mlog的need_inout逻辑3 caoqianming 2025-04-23 09:28:45 +0800
32185abffd fix: mlog的need_inout逻辑2 caoqianming 2025-04-22 16:33:52 +0800
c2539185e2 feat: mlog增加team字段 caoqianming 2025-04-22 15:49:42 +0800
3811c055f9 feat: mlog的need_inout逻辑 caoqianming 2025-04-22 15:27:02 +0800
6e12ca3137 feat: 批次关系链时创建新批次支持使用已有批次号2 caoqianming 2025-04-22 14:30:19 +0800
f22ba2752f feat: 批次关系链时创建新批次支持使用已有批次号 caoqianming 2025-04-22 14:29:33 +0800
ea00a38406 feat: mlogb返回test_user_name caoqianming 2025-04-22 10:16:10 +0800
3d0536745a fix: count_working获取逻辑优化2 caoqianming 2025-04-22 09:56:23 +0800
e329c8cbc8 fix: count_working获取逻辑优化 caoqianming 2025-04-22 09:34:34 +0800
8ac3ad3477 feat: mlogb添加test_user/need_inout字段用于处理抽检逻辑 caoqianming 2025-04-22 09:19:19 +0800
42c249330e fix: mlogbin解决负值校验存在的bug caoqianming 2025-04-22 09:14:11 +0800
f12d8ce03c feat: 工艺步骤返回组合而成的name caoqianming 2025-04-22 09:08:44 +0800
311e9e9e04 feat: 校验只有合并时才能提供新批次号 caoqianming 2025-04-22 08:43:05 +0800
5cab0d018b feat: 交接查询可查询子批次号 caoqianming 2025-04-21 16:27:31 +0800
ced7515d80 feat: 日志完善负值校验 caoqianming 2025-04-21 15:43:54 +0800
2ea3dc79cb feat: 批号追加工段标识2 caoqianming 2025-04-21 13:22:39 +0800
82587b1736 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-04-21 11:33:11 +0800
786d178edc feat: 批号追加工段标识 caoqianming 2025-04-21 11:32:57 +0800
181d477425 fix: 日志和交接记录操作数正值校验 caoqianming 2025-04-19 23:40:42 +0800
0489a545e8 fix: inm校验非正数 caoqianming 2025-04-19 23:24:43 +0800
e24d92fe9b feat: base增加PositiveDecimalField caoqianming 2025-04-19 22:41:26 +0800
adcde59bd1 fix: 其他入库时batchst.g_create传参错误 caoqianming 2025-04-19 21:23:21 +0800
101a51050d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-04-19 21:15:35 +0800
9e4e5a28c6 fix:: 交接记录提交时校验count>0 caoqianming 2025-04-19 21:11:45 +0800
00e352d8ef feat: 改版交接需要触发统计数量 caoqianming 2025-04-18 14:52:03 +0800
1e379d412c feat: 物料统计数量接口 caoqianming 2025-04-18 14:18:41 +0800
2b9e3322ac feat: update_material_count时更新组合件数量 caoqianming 2025-04-18 14:13:34 +0800
6678e39518 feat: 采购和其他入库可入已有批次 caoqianming 2025-04-18 11:29:32 +0800
b44fec0695 feat: 合并的交接需要校验物料是否一致 caoqianming 2025-04-17 14:05:56 +0800
6d904341a0 feat: 交接需要校验物料是否一致 caoqianming 2025-04-17 13:30:30 +0800
369c452dd5 fix: 正常交接后的物料状态不变 caoqianming 2025-04-17 11:17:05 +0800
fafe39c1bd fix: 存在fmlog时将route带给mlog并进行物料校验 caoqianming 2025-04-17 11:16:40 +0800
044b489388 fix: do_in保证production_dept赋值 caoqianming 2025-04-17 11:16:08 +0800
1aad0bc481 fix: 订单检索条件错误 caoqianming 2025-04-17 11:13:59 +0800
5f2385ccd1 fix: fmlog填写mtask或route即可 caoqianming 2025-04-17 09:06:34 +0800
896be043f5 feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成 caoqianming 2025-04-16 19:14:18 +0800
9179803fda feat: 检验项和缺陷项删除的时候同步删除qct caoqianming 2025-04-16 19:12:49 +0800
b5c21b7472 feat: fmlog添加工艺步骤字段及相应返回数据 caoqianming 2025-04-16 17:59:20 +0800
4bc126ca97 release: 2.6.2025041613 2.6.2025041613 caoqianming 2025-04-16 13:49:06 +0800
300023ff81 fix: 交接分批bug/加工前不良的bug caoqianming 2025-04-16 13:43:38 +0800
e0217e86c4 feat: 添加count_json_from字段及相应逻辑 caoqianming 2025-04-16 11:31:23 +0800
4c7f2b24f8 feat: 车间库存按任务筛选时count>0 caoqianming 2025-04-16 08:57:12 +0800
7a3c5be4eb feat: 工艺步骤增加排序字段 caoqianming 2025-04-15 18:14:00 +0800
d3263236f9 feat: 物料筛选low_inm进行优化 caoqianming 2025-04-15 18:13:41 +0800
50b264929b fix: mio_saleout时正确计算delivered_count caoqianming 2025-04-15 17:44:43 +0800
4874f6356e feat: 变更order状态 caoqianming 2025-04-15 15:09:03 +0800
d864405c0d feat: 扣减库存不足增加提示 caoqianming 2025-04-15 15:08:42 +0800
8c27b1a03c feat: update_inm关于销售发货/其他出库的bug2 caoqianming 2025-04-15 14:31:58 +0800
afc884eb7f feat: update_inm关于销售发货/其他出库的bug caoqianming 2025-04-15 11:06:16 +0800
c670bd69e1 feat: fmlog添加is_fix字段校验 caoqianming 2025-04-15 10:30:02 +0800
cd294bc53c fix: 返修交接后物料状态都变为返修品 caoqianming 2025-04-14 23:03:34 +0800
88bf75baaf feat: fmlog添加is_fix字段 caoqianming 2025-04-14 22:49:31 +0800
1cbbade280 feat: 单个日志填写时带入wm_in的batch caoqianming 2025-04-14 22:26:42 +0800
c791bde5be fix: handover拆批请选择车间库存2 caoqianming 2025-04-14 15:29:36 +0800
22b6b1305f fix: handover拆批请选择车间库存 caoqianming 2025-04-14 15:19:45 +0800
882b0f2cbd feat: 添加ichat以支持AI对话 caoqianming 2025-04-13 10:12:38 +0800
f228884b27 release: 2.6.2025041113 2.6.2025041113 caoqianming 2025-04-11 13:33:48 +0800
fda9ecae94 fix: get_alldata_with_batch中小数计算异常捕获 caoqianming 2025-04-11 10:16:51 +0800
1ff822161a feat: ptest性能检验样品编号字段更改为text caoqianming 2025-04-11 08:42:10 +0800
4b87f6fe8e Merge branch 'gzerp' caoqianming 2025-04-09 15:30:58 +0800
648aaa465c fix: 光子综合查询对小数和None的处理 caoqianming 2025-04-09 15:30:17 +0800
cdc30f5163 release: 2.6.2025040913 2.6.2025040913 caoqianming 2025-04-09 13:20:45 +0800
060c07abd7 fix: 来料加工和完成筛选完善 caoqianming 2025-04-09 13:19:12 +0800
c0eacd7fa8 fix: decimal存入json字段时使用myjsondecoder caoqianming 2025-04-09 13:18:42 +0800
8068cb1ca3 fix: cal_x_task_count分配任务数的bug caoqianming 2025-04-09 13:18:00 +0800
15ccfbe6f9 feat: 添加MyJSONEncoder以支持decimal caoqianming 2025-04-09 10:50:18 +0800
948bbcb805 release: 2.6.2025040813 2.6.2025040813 caoqianming 2025-04-08 13:38:31 +0800
2a0c97dfb2 fix: ftest当is_ok为True时设置defect为空 caoqianming 2025-04-08 11:38:46 +0800
b34e477593 fix: ftest当is_ok为false时才设置defect_main caoqianming 2025-04-08 11:06:51 +0800
ef0414b053 fix: material_out_tracking获取时对None的情况进行处理 caoqianming 2025-04-08 08:38:22 +0800
1efd1c71da release: 2.6.2025040710 2.6.2025040710 caoqianming 2025-04-07 10:29:00 +0800
b852e9b740 fix: get_dag时matin matout为空时不报错 caoqianming 2025-04-07 10:18:43 +0800
61488bb4bd feat: copy时matin matout不自动生成 caoqianming 2025-04-07 10:13:33 +0800
166b83c04d release: 2.6.2025040316 2.6.2025040316 caoqianming 2025-04-03 16:42:49 +0800
de5f231154 release: 2.6.2025040316 caoqianming 2025-04-03 16:35:14 +0800
9f0a9fc699 fix: 通过指定mat_in/mat_out复制工艺路线 bug2 caoqianming 2025-04-03 16:12:35 +0800
885d932fc8 fix: 通过指定mat_in/mat_out复制工艺路线 bug1 caoqianming 2025-04-03 16:11:54 +0800
b400b13ded feat: 通过指定mat_in/mat_out复制工艺路线 caoqianming 2025-04-03 14:48:14 +0800
a8f9676ed0 fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal caoqianming 2025-04-03 08:34:57 +0800
a79717abd8 fix: 组合件入库后未添加count的bug caoqianming 2025-04-02 18:39:31 +0800
18546d48f5 feat: 销售发货编号非必填 caoqianming 2025-04-02 16:31:12 +0800
10e0f4aaef release: 2.6.2025040211 2.6.2025040211 caoqianming 2025-04-02 11:19:42 +0800
2923fad2a8 feat: HTML_BASE_URL 前缀统一修改 caoqianming 2025-04-02 11:04:46 +0800
5fe24c381b feat: sysbaseview返回系统版本号 caoqianming 2025-04-02 10:12:30 +0800
20943494ad fix: base log delay=True减少冲突 caoqianming 2025-04-02 10:11:00 +0800
783a56dfea fix: get_can_save_from_save_expr的match转为str caoqianming 2025-04-02 09:32:33 +0800
cde15991a1 feat: 2.6.2025040115 2.6.2025040115 caoqianming 2025-04-01 15:57:30 +0800
6dfb5c489a fix: 该工艺步骤已存在的校验bug caoqianming 2025-04-01 15:41:33 +0800
c05c59b004 feat: handover数据库变动/初步更新批次数据关系链 caoqianming 2025-03-31 16:42:18 +0800
cb28f1d9ef feat: 添加mio,mlog,handover关于batch的查询条件 caoqianming 2025-03-31 15:35:39 +0800
146fe6641f feat: get_batch_dag节点排序改动 caoqianming 2025-03-31 15:11:43 +0800
0b76602c84 change: base 改变log backupcount为30 caoqianming 2025-03-31 15:08:23 +0800
1936fe183f perf: base settings里日志记录handler优化 caoqianming 2025-03-31 15:04:39 +0800
3c0e416735 feat: 支持退料交接 caoqianming 2025-03-31 14:17:20 +0800
88da422f54 feat: mlogchangeserializer增加生产设备选择 caoqianming 2025-03-31 13:36:25 +0800
853c28976d feat: 完善版本追踪 2.6.2025033109 caoqianming 2025-03-31 11:10:47 +0800