Commit Graph

725 Commits

Author SHA1 Message Date
caoqianming ced7515d80 feat: 日志完善负值校验 2025-04-21 15:43:54 +08:00
caoqianming 2ea3dc79cb feat: 批号追加工段标识2 2025-04-21 13:22:39 +08:00
caoqianming 82587b1736 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-04-21 11:33:11 +08:00
caoqianming 786d178edc feat: 批号追加工段标识 2025-04-21 11:32:57 +08:00
caoqianming 181d477425 fix: 日志和交接记录操作数正值校验 2025-04-19 23:40:42 +08:00
caoqianming 101a51050d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-04-19 21:15:35 +08:00
caoqianming 9e4e5a28c6 fix:: 交接记录提交时校验count>0 2025-04-19 21:11:45 +08:00
caoqianming 00e352d8ef feat: 改版交接需要触发统计数量 2025-04-18 14:52:03 +08:00
caoqianming b44fec0695 feat: 合并的交接需要校验物料是否一致 2025-04-17 14:05:56 +08:00
caoqianming 6d904341a0 feat: 交接需要校验物料是否一致 2025-04-17 13:30:30 +08:00
caoqianming 369c452dd5 fix: 正常交接后的物料状态不变 2025-04-17 11:17:05 +08:00
caoqianming fafe39c1bd fix: 存在fmlog时将route带给mlog并进行物料校验 2025-04-17 11:16:40 +08:00
caoqianming 5f2385ccd1 fix: fmlog填写mtask或route即可 2025-04-17 09:06:34 +08:00
caoqianming 896be043f5 feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成 2025-04-16 19:14:18 +08:00
caoqianming b5c21b7472 feat: fmlog添加工艺步骤字段及相应返回数据 2025-04-16 17:59:20 +08:00
caoqianming 300023ff81 fix: 交接分批bug/加工前不良的bug 2025-04-16 13:43:38 +08:00
caoqianming e0217e86c4 feat: 添加count_json_from字段及相应逻辑 2025-04-16 11:31:23 +08:00
caoqianming 4c7f2b24f8 feat: 车间库存按任务筛选时count>0 2025-04-16 08:57:12 +08:00
caoqianming c670bd69e1 feat: fmlog添加is_fix字段校验 2025-04-15 10:30:02 +08:00
caoqianming cd294bc53c fix: 返修交接后物料状态都变为返修品 2025-04-14 23:03:34 +08:00
caoqianming 88bf75baaf feat: fmlog添加is_fix字段 2025-04-14 22:49:31 +08:00
caoqianming 1cbbade280 feat: 单个日志填写时带入wm_in的batch 2025-04-14 22:26:42 +08:00
caoqianming c791bde5be fix: handover拆批请选择车间库存2 2025-04-14 15:29:36 +08:00
caoqianming 22b6b1305f fix: handover拆批请选择车间库存 2025-04-14 15:19:45 +08:00
caoqianming fda9ecae94 fix: get_alldata_with_batch中小数计算异常捕获 2025-04-11 10:16:51 +08:00
caoqianming 4b87f6fe8e Merge branch 'gzerp' 2025-04-09 15:30:58 +08:00
caoqianming 648aaa465c fix: 光子综合查询对小数和None的处理 2025-04-09 15:30:17 +08:00
caoqianming 060c07abd7 fix: 来料加工和完成筛选完善 2025-04-09 13:19:12 +08:00
caoqianming c0eacd7fa8 fix: decimal存入json字段时使用myjsondecoder 2025-04-09 13:18:42 +08:00
caoqianming a8f9676ed0 fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal 2025-04-03 08:34:57 +08:00
caoqianming 2923fad2a8 feat: HTML_BASE_URL 前缀统一修改 2025-04-02 11:04:46 +08:00
caoqianming c05c59b004 feat: handover数据库变动/初步更新批次数据关系链 2025-03-31 16:42:18 +08:00
caoqianming cb28f1d9ef feat: 添加mio,mlog,handover关于batch的查询条件 2025-03-31 15:35:39 +08:00
caoqianming 146fe6641f feat: get_batch_dag节点排序改动 2025-03-31 15:11:43 +08:00
caoqianming 3c0e416735 feat: 支持退料交接 2025-03-31 14:17:20 +08:00
caoqianming 88da422f54 feat: mlogchangeserializer增加生产设备选择 2025-03-31 13:36:25 +08:00
caoqianming 73f0e504c9 feat: batchst g_create 默认relation_type 2025-03-28 08:28:58 +08:00
caoqianming c002017a84 feat: 工艺路线支持子图逻辑 2025-03-27 12:40:09 +08:00
caoqianming eaa5d75b99 feat: 工艺路线校验 2025-03-26 16:36:29 +08:00
caoqianming 4e7757f64d feat: 合批时的物料校验 2025-03-26 13:30:39 +08:00
caoqianming 0ddc6692ac feat: handover 合并可指定现有库存 2025-03-26 13:19:30 +08:00
caoqianming 8bf3ad06d6 feat: mlog get_queryset bug 2025-03-25 15:40:53 +08:00
caoqianming 546b020dae feat: mloguserserializer handle_user_name 2025-03-25 14:59:01 +08:00
caoqianming 0e8cce0669 feat: get_batch_dag bug2 2025-03-25 09:54:57 +08:00
caoqianming 11d7e1a772 feat: get_batch_dag bug 2025-03-25 09:51:25 +08:00
caoqianming 52b96dc740 fix: batchst g_create bug 2025-03-25 09:48:17 +08:00
caoqianming 6f28056ed4 feat: 重构以下batchlog 2025-03-25 09:44:22 +08:00
caoqianming b9a3427162 feat: batchst添加查询条件 2025-03-24 15:18:44 +08:00
caoqianming d4df340c1c feat: batchst添加字段以追踪material_start 2025-03-24 15:16:37 +08:00
caoqianming b070b312a8 feat: batchst添加字段以追踪 2025-03-24 15:07:50 +08:00