Commit Graph

251 Commits

Author SHA1 Message Date
caoqianming 3ce03827bf fix: 出入库change_or_new要处理ftest 2025-02-25 15:10:43 +08:00
caoqianming 0e96485fae feat: mioitem添加count_tested 2025-02-25 10:33:22 +08:00
caoqianming af999467db fix: 去除materialbatch的数据库约束 2025-02-21 17:23:28 +08:00
caoqianming a1525d1289 fix: mb create加锁 2025-02-21 17:05:50 +08:00
caoqianming 07473ddf90 feat: mio出入库支持选入mioitemw 2025-02-21 11:01:47 +08:00
caoqianming 7200bc45b3 fix: do_in xmaterial的type error 2025-02-20 14:48:18 +08:00
caoqianming b062d7ef6b fix: cal_material_count 挪到单独文件里 2025-02-18 11:03:22 +08:00
caoqianming edac22b701 feat: cal_material_count 改为同步执行 2025-02-18 10:51:31 +08:00
caoqianming f8416d91b6 feat: 增加mio返回is_tested 2025-02-10 18:19:06 +08:00
caoqianming 1a3e428195 feat: do_in 支持wpr 2025-02-08 15:31:35 +08:00
caoqianming 33f162fa3a fix: do_in 的bug 2025-02-08 14:49:30 +08:00
caoqianming f004417d49 fix: ftest增加defect_main的后续逻辑变更 bug 2025-01-17 17:18:26 +08:00
caoqianming 4699b31f83 feat: ftest增加defect_main的后续逻辑变更 2025-01-17 16:52:14 +08:00
caoqianming 6bcafcad3a fix: 变更单件产品的属性问题3 2025-01-17 10:19:58 +08:00
caoqianming 8b7887ec43 fix: 变更单件产品的属性问题 2025-01-17 09:57:53 +08:00
caoqianming 7605574f37 fix: update_mb_item bug 2025-01-17 09:29:33 +08:00
caoqianming 7382eed0b6 fix: 修改mioitemw的外键名字 2025-01-17 08:58:44 +08:00
caoqianming 31f2fdde84 fix: 采购入库支持检验3 2025-01-16 17:30:53 +08:00
caoqianming 2f259bd5f3 feat: 采购入库支持检验2 2025-01-16 17:15:38 +08:00
caoqianming 8bcd6b4f69 feat: 采购入库支持检验 2025-01-16 17:09:01 +08:00
caoqianming 24bdb818a5 feat: 采购入库才可进行检验 2025-01-16 08:34:59 +08:00
caoqianming 923ac2276c feat: 隐式物料不可出入库 2025-01-15 17:13:28 +08:00
caoqianming a7b14994b7 feat: mioitemw添加ftest字段 2025-01-15 16:07:53 +08:00
caoqianming a2a89a0785 feat: 增加mioitemw的update 2025-01-15 15:02:19 +08:00
caoqianming 5409f5d55d feat: mioitemw test 2025-01-15 13:37:28 +08:00
caoqianming 620ed2e19e fix: mioserializer add mio_user 2025-01-14 11:35:34 +08:00
caoqianming f8b056cadb feat: mioitemw为1个时自动创建2 2025-01-03 17:50:05 +08:00
caoqianming 53f3f25030 feat: mioitemw为1个时自动创建 2025-01-03 17:46:18 +08:00
caoqianming 38978c9dea feat: mioitem增加wm和mb字段 2025-01-03 17:33:08 +08:00
caoqianming 437501b668 feat: mioitemw等增加wpr字段 2025-01-03 16:53:42 +08:00
caoqianming 86007d0ad4 fix: MIOItemwSerializer修改 2025-01-03 15:19:44 +08:00
caoqianming 8d0d5ebcd0 fix: 主要是wpmw change_or_new的修正 2025-01-03 14:37:57 +08:00
caoqianming ba41228d69 fix: 生产提交支持单个物料 2025-01-02 14:01:09 +08:00
caoqianming 2c107d4050 fix: 生产领料支持单个 2025-01-02 11:32:11 +08:00
caoqianming 82070c2bf1 feat: 生产领料支持单个 2025-01-02 11:28:16 +08:00
caoqianming 64fc04d368 fix: 先注释mioitemw 2025-01-02 10:44:53 +08:00
caoqianming 37a6f37af5 feat: wproducts统一用wprs 2025-01-02 10:41:42 +08:00
caoqianming def67ebac5 fix: base 添加wpmw并支持出入库提交 2025-01-02 10:32:36 +08:00
caoqianming 73b1d58b8a fix: base 添加wpmw app以追踪到个 2025-01-02 09:37:37 +08:00
caoqianming 796d6e248f fix: base materialbatch添加字段 2025-01-02 09:35:18 +08:00
caoqianming d3a35fac31 feat: mioitemwtest 接口 2024-12-31 10:53:46 +08:00
caoqianming f6fe704f65 feat: MIOItemCreateSerializer wproducts设置为非必填 2024-12-31 08:57:13 +08:00
caoqianming b50cbcbc92 fix: 添加mioitemw 2024-12-31 08:50:23 +08:00
caoqianming 7621be49b6 feat: 添加mioitemw 2024-12-31 08:45:52 +08:00
caoqianming d349970a47 doc: 删除一部分print语句 2024-12-11 08:41:35 +08:00
caoqianming b93c4bddeb feat: 触发批次分析统计 2024-12-03 18:07:23 +08:00
caoqianming c3bd32ee68 feat: property改为classmethod 2024-12-02 13:13:28 +08:00
caoqianming 8435b35be6 feat: get_alldata_with_batch 2024-12-02 12:27:26 +08:00
caoqianming 2c569db0d8 fix: do_in wm_production_dept 2024-11-21 17:23:35 +08:00
caoqianming 8c63aea877 fix: validate data pop None 2024-11-21 17:04:36 +08:00
caoqianming 4518344fa6 fix: do_out 领料时的material_ofrom 2024-11-14 13:04:40 +08:00
caoqianming 6ef01ee301 fix: 其他出入库错误 2024-11-14 12:26:40 +08:00
caoqianming 6006d42f9d fix: do_in bug 2024-11-14 11:54:55 +08:00
caoqianming 384bef705c fix: MaterialBatch 添加字段以支持追踪原料批次6 2024-11-14 11:02:05 +08:00
caoqianming e92ceca953 feat: MaterialBatch 添加字段以支持追踪原料批次5 2024-11-14 10:52:21 +08:00
caoqianming b5928b2927 feat: MaterialBatch 添加字段以支持追踪原料批次4 2024-11-14 10:40:14 +08:00
caoqianming 90e699155c feat: MaterialBatch 添加字段以支持追踪原料批次3 2024-11-13 18:16:02 +08:00
caoqianming 27c646e6df feat: MaterialBatch 添加字段以支持追踪原料批次2 2024-11-13 17:23:41 +08:00
caoqianming 4016c421be feat: MaterialBatch 添加字段以支持追踪原料批次 2024-11-13 17:22:25 +08:00
caoqianming ed8ee4e68d feat: materialbatch 添加supplier字段 2024-10-11 13:36:53 +08:00
caoqianming 49712b8211 feat: mio添加mgroup查询条件 2024-09-24 10:24:51 +08:00
caoqianming bb270d7105 feat: inm mio相关增加inout_date校验 2024-09-08 14:32:49 +08:00
caoqianming 89af31a383 feat: 增加check_test_when_do_out配置参数 2024-09-03 09:48:10 +08:00
caoqianming 561c2a0c31 feat: materialbatch也不进行物理删除 2024-08-20 14:25:01 +08:00
caoqianming 42769e3abe fix: mioitempurin bug 2024-08-14 18:17:31 +08:00
caoqianming 27c60ff973 feat: mio pur test 支持count_sampling自填 2024-08-13 17:28:39 +08:00
caoqianming 3bb3834c04 fix: miolist pu_order_number 2024-08-13 17:11:22 +08:00
caoqianming e3a276c634 feat: MaterialBatchSerializer 改变material_name 2024-07-30 17:05:55 +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 4bbe973071 Merge branch 'erp1' 2024-07-24 10:52:35 +08:00
caoqianming 2e1f94b24c feat: order增加filter/miosale增加校验 2024-07-24 10:51:42 +08:00
caoqianming 061a291889 feat: 增加handover和mio的查询条件 2024-07-15 17:57:39 +08:00
caoqianming 4c93bb98de fix: daoru_mb cal_material bug 2024-07-09 16:16:32 +08:00
caoqianming 56e40e6dd3 fix: 更改mythread的使用 2024-07-05 10:49:17 +08:00
caoqianming 92903e7014 feat: cal_material_count 重构 2024-07-04 16:23:28 +08:00
caoqianming 7381a65c24 feat: 重新梳理计算物料总数量 2024-07-04 10:04:49 +08:00
caoqianming 0473be4d30 feat: 检验撤回test_date在count_notok时直接置空 2024-05-30 10:55:13 +08:00
caoqianming 458385c0f6 feat: material增加count_mb字段 2024-05-28 14:29:20 +08:00
caoqianming 7b83cd1095 refector: 检验撤回根据count_notok进行update_mb 2024-04-24 16:22:36 +08:00
caoqianming 22e5ff6180 refector: 检验撤回的优化 2024-04-23 09:13:21 +08:00
caoqianming 6f8ab25b5c feat: 增加半成品检验撤回功能 2024-04-22 11:14:53 +08:00
caoqianming f7d5375a5f fix: 优化物料批次导入 2024-04-17 22:46:05 +08:00
caoqianming 19f6e18154 feat: material的count改为对所有库存进行统计 2024-04-09 08:40:28 +08:00
caoqianming 9b2dbb8a01 feat: 增加矫正correct_material_count的task 2024-04-08 18:34:04 +08:00
caoqianming 8c798984f3 fix: correct_mb_count_notok 2024-04-08 17:08:08 +08:00
caoqianming fa3452088f fix: correct_mb_count_notok 2024-04-08 17:03:48 +08:00
caoqianming e8802c09b2 fix: 矫正mioitem count_notok错误的数据 2024-04-08 16:30:28 +08:00
caoqianming fe19847458 feat: mioitem增加扁不合格项字段 2024-04-08 13:53:12 +08:00
caoqianming c6222c65f6 feat: 半成品检验有关库存消耗完的逻辑处理 2024-04-07 18:33:40 +08:00
caoqianming 29f085253c fix: MIOPurSerializer添加supplier 2024-04-07 15:18:41 +08:00
caoqianming 68fc7f4217 feat: 生产领料校验优化 2024-04-03 09:23:27 +08:00
caoqianming 0b193c6950 fix: correct_mb优化 2024-04-02 22:39:24 +08:00
caoqianming 2982bccf7f fix: 多了一次save调用 2024-04-02 17:22:56 +08:00
caoqianming 759bd3e149 feat: mio支持从明细批次号查询 2024-04-02 17:19:07 +08:00
caoqianming c5ae117436 feat: mioitem增加划伤字段 2024-04-02 17:11:02 +08:00
caoqianming 6254e251d3 feat: 生产领料半成品时需校验是否经过检验 2024-04-02 17:07:22 +08:00
caoqianming 462a25bb9a feat: 生产入库update_mb时记录production_dept 2024-04-02 16:46:13 +08:00
caoqianming aaa5545c30 feat: 增加correct_material_batch以矫正mb 2024-04-02 16:14:33 +08:00
caoqianming c8bcbc62c3 feat: inm支持小数点后3位 2024-04-02 12:27:19 +08:00
caoqianming 7d5b1223d5 feat: inm mioitem同步数据库 2024-04-02 11:40:07 +08:00
caoqianming 7e18ea572a feat: mioitem添加检验备注等字段 2024-04-02 10:21:22 +08:00
caoqianming 0e0262d170 feat: mioitem添加js,qx字段 2024-03-22 14:57:06 +08:00
caoqianming f51075e1ef feat: 采购入库和销售出库订单可为空 2024-03-01 17:36:43 +08:00
caoqianming ab3bcee0f8 fix: 生产领料反向操作bug 2024-03-01 15:16:19 +08:00
caoqianming 4c75328e67 feat: materialbatch默认按update_time倒序排列 2024-03-01 15:09:41 +08:00
caoqianming eef99ed624 feat: 出入库操作支持提交后可撤销功能 2024-02-29 17:10:50 +08:00
caoqianming c8cc3469e1 feat: 物料批次导入功能 2024-01-29 15:57:40 +08:00
caoqianming 30dbeacdd0 fix: 修改mio查询条件以支持materials为空的情况 2024-01-25 09:45:12 +08:00
caoqianming 1d2f9f09eb feat: mioviewset prefetch_related_fields优化 2024-01-24 12:35:50 +08:00
caoqianming 6cb22744c2 fix: 增加materials__type__in筛选 2024-01-24 12:31:36 +08:00
caoqianming 4a0f73c783 feat: 增加materials 筛选 2024-01-24 11:48:33 +08:00
caoqianming 20e209ced2 fix: update_mb更新物料库存的bug 2024-01-23 18:03:05 +08:00
caoqianming 7ca12228e2 feat: 库存减到0时删除该记录 2024-01-11 17:56:00 +08:00
caoqianming 4697f30ef1 feat: mioitem返回inout_date 2023-12-26 17:18:31 +08:00
caoqianming 48fbcb5e9c feat: mioitem增加inout_date筛选 2023-12-26 13:10:42 +08:00
caoqianming 4f318d823a feat: mio增加item_mio__material__type查询条件 2023-12-25 10:18:35 +08:00
caoqianming 9d3f006017 feat: MIOItemerializer返回物料全名 2023-12-22 13:58:45 +08:00
caoqianming 0870b13ea3 feat: mioitem增加入厂检验 2023-12-18 15:52:54 +08:00
caoqianming eadf36c1d1 fix: mioitem修改字段名 2023-12-15 19:39:17 +08:00
caoqianming 768a07a39a feat: mio增加筛选条件 2023-12-13 16:08:16 +08:00
caoqianming d94424131f feat: materialbatch增加查询条件 2023-11-30 17:05:34 +08:00
caoqianming ccc87a5a5c fix: mioitem select_related bug 2023-11-27 23:29:24 +08:00
caoqianming 784d1a79dc feat: 出入库明细筛选条件 2023-11-21 16:53:17 +08:00
caoqianming 286571d302 feat: 出入库明细增加筛选条件 2023-11-17 14:05:13 +08:00
caoqianming cd40d7f899 feat: mio增加mio_user 2023-11-17 08:29:09 +08:00
caoqianming 2ae8913b25 feat: 一些统计分析接口可用bi替代 2023-11-14 13:48:07 +08:00
caoqianming a39e87c8f3 fix: MIOItemACreateSerializer bug 2023-11-03 18:25:22 +08:00
caoqianming 5f9c810502 feat: 棒管检验明细 2023-11-03 18:15:32 +08:00
caoqianming 39fbf6d0f3 feat: mioitem增加查询条件 2023-11-03 14:06:33 +08:00
caoqianming d9ef7548e4 feat: 出入库明细检验 2023-11-03 14:01:03 +08:00
caoqianming 35052699da feat: miodetail 2023-10-27 16:19:11 +08:00
caoqianming d76b0ca0e4 feat: 增加校验 2023-10-25 17:02:41 +08:00
caoqianming 143f045f11 fix: 字段名错误 2023-10-25 17:02:26 +08:00
caoqianming b872726885 feat: 出入库编号唯一 2023-10-25 16:51:12 +08:00
caoqianming e9845a246e fix: 组合件出入库bug 2023-10-25 15:51:25 +08:00
caoqianming 2a384ea654 fix: mioitem返回warehouse name错误 2023-10-25 13:43:05 +08:00
caoqianming 4894f134c5 feat: mio权限控制 2023-10-25 08:41:25 +08:00
caoqianming bc2a16a9a4 feat: 增加组合件出入库 2023-10-24 10:26:13 +08:00
caoqianming 80b2685417 fix: 采购入库逻辑的bug 2023-10-19 14:04:41 +08:00
caoqianming 84db42e7c4 refector: 更新物料总量用update 2023-10-18 16:26:45 +08:00
caoqianming 56ed286eaf feat: mio和mioitem的权限控制 2023-10-11 16:27:44 +08:00
caoqianming 65c6dab239 feat: 优化mio list请求 2023-10-11 15:23:50 +08:00
caoqianming 9461d57159 feat: 出入库记录新增分多个接口 2023-10-11 15:16:58 +08:00
caoqianming 9ebf15b04f feat: 生产入库后变更车间物料 2023-09-28 09:22:37 +08:00
caoqianming f13de6b2c5 refector: 生产领料接口同时支持生产入库 2023-09-27 17:02:00 +08:00
caoqianming 9504b527cb feat: 增加车间库存并完成生产领料 2023-09-27 15:41:36 +08:00
caoqianming 515d0b5c17 feat: 出入库明细接口 2023-09-26 11:24:52 +08:00
caoqianming 0cd2802b04 feat: 更新material的count 2023-09-21 16:27:22 +08:00
caoqianming c6af3f7f62 feat: 增加出入库记录 2023-09-21 10:20:19 +08:00