Commit Graph

2173 Commits

Author SHA1 Message Date
caoqianming 42c1386efd feat: sflogexp增加返回信息 2024-08-06 08:29:21 +08:00
caoqianming 6931c49b3b feat: oplserializer 添加返回信息 2024-08-04 20:28:18 +08:00
caoqianming fe97d36f54 feat: opl添加字段 2024-08-04 18:50:42 +08:00
caoqianming a6b29949ef Merge branch 'erp1' 2024-08-02 21:13:33 +08:00
caoqianming 1003e0aea7 feat: route添加filter 2024-08-02 21:13:15 +08:00
caoqianming c58e34a7fd feat: route添加filter 2024-08-02 21:00:13 +08:00
caoqianming fa56d61ffc feat: 修改nowx使用aware 2024-08-02 16:39:07 +08:00
caoqianming 4604809bf4 feat: bind_routepack 时取消第一步的批次校验 2024-08-02 13:52:14 +08:00
caoqianming dc7e6f9d03 fix: get_total_sec_now及cal_exp_duration_sec 添加now参数 2024-08-02 13:50:05 +08:00
caoqianming 313e9ed1cd fix: routeserializer优化routepack process校验3 2024-08-02 11:14:45 +08:00
caoqianming f5482285f2 fix: routeserializer优化routepack process校验2 2024-08-02 11:11:08 +08:00
caoqianming 757bf89d71 fix: enstat hour_s查询时按真实事件查询 2024-08-02 10:50:22 +08:00
caoqianming adffac48ad fix: routeserializer优化routepack process校验 2024-08-02 09:13:00 +08:00
caoqianming aa42ba6e3f feat: submit时校验消耗和产出是否已经填写 2024-08-01 18:12:30 +08:00
caoqianming 071558af8d feat: mlogbin 校验记录已存在 2024-08-01 17:32:48 +08:00
caoqianming cbedb81b0e fix: mlogbin 不合格物料校验去除 2024-08-01 16:54:09 +08:00
zty c293dd068f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-01 15:55:22 +08:00
zty 261ed40d94 fix: fim.py cost_unit 字段 2024-08-01 15:55:19 +08:00
caoqianming cbe516ccf5 fix: handover submit时更新bug 2024-08-01 15:25:16 +08:00
caoqianming 6efcf19716 fix: mlog_revert bug 2024-08-01 15:15:00 +08:00
caoqianming f3f0ea132c fix: find_material_can_change 只可返工到半成品 2024-08-01 10:30:55 +08:00
caoqianming 9ff4f21f9a fix: mlogbin create时生成编号变更3 2024-08-01 09:59:39 +08:00
caoqianming 99ab4e1957 feat: mlogbin create时生成编号变更2 2024-08-01 09:20:15 +08:00
caoqianming 3f62e8709f feat: 采购计划和订单增加单价和总价 2024-07-31 19:18:51 +08:00
caoqianming 9e26f416a5 feat: 变更物料单价字段为小数 2024-07-31 19:18:24 +08:00
caoqianming a589fec67e feat: enstat2添加统计字段 2024-07-31 16:53:23 +08:00
caoqianming 0813a3b568 feat: mlogbin create时生成编号变更 2024-07-31 16:33:32 +08:00
caoqianming 9dcc4c0910 feat: 工序增加字段batch_append_equip 2024-07-31 16:30:00 +08:00
caoqianming 93b1a80cfb feat: 供应商增加字段number 2024-07-31 16:29:11 +08:00
caoqianming 821d7613d1 fix: get_sflog 增加 sflog创建范围 2024-07-31 15:55:34 +08:00
caoqianming 19167887d5 fix: mgroup_run_change bug 2024-07-31 15:34:50 +08:00
caoqianming bea83f93d5 fix: 批次号追加设备编号 2024-07-31 14:30:53 +08:00
caoqianming 9ad0cf6498 feat: 批次号追加number 2024-07-31 14:27:15 +08:00
caoqianming 166ae8b12c feat: base user增加筛选条件 2024-07-31 13:43:32 +08:00
caoqianming 321be50323 feat: MaterialBatchSerializer 改变material_name 2024-07-30 17:06:28 +08:00
caoqianming e3a276c634 feat: MaterialBatchSerializer 改变material_name 2024-07-30 17:05:55 +08:00
zty 181a4e3a5f fix: HandoverSerializer recive_mgroup 校验bug 2024-07-30 15:11:23 +08:00
zty ebf6f739ca feat: 出入库添加工段逻辑 2024-07-30 13:24:21 +08:00
zty a587e570f0 feat: mio 添加 mgroup字段 2024-07-30 11:40:18 +08:00
caoqianming 893781ec7f feat: db_insert_mplogx不用thread 2024-07-30 10:01:42 +08:00
caoqianming f5c22d460b Merge branch 'erp1' 2024-07-29 17:24:42 +08:00
caoqianming e853fe33b1 feat: gen_material_out 优化并变更物料信息 2024-07-29 17:24:25 +08:00
caoqianming 93d26ec100 Merge branch 'erp1' 2024-07-29 16:21:22 +08:00
caoqianming a4417e7a4f fix: gen_material_out bug 2024-07-29 16:20:43 +08:00
caoqianming ebfb96b12e feat: material delete 时 update 子物料 2024-07-29 16:16:20 +08:00
caoqianming 76c14460f5 fix: base handle_parent 错误 2024-07-29 11:12:53 +08:00
caoqianming effffe34bf fix: base handle_parent 错误 2024-07-29 11:12:13 +08:00
caoqianming 92c6939a9c refactor: base 更新permission 描述 2024-07-29 10:32:36 +08:00
caoqianming 38eaefe3bb refactor: base 更新permission 描述 2024-07-29 10:31:46 +08:00
caoqianming 05b46b5351 fix: EnvData get_or_create 避免报错 2024-07-29 08:38:57 +08:00