Commit Graph

497 Commits

Author SHA1 Message Date
luoliming f8d30f9208 4 2024-02-15 22:53:35 +08:00
luoliming 27fc46f294 4 2024-02-15 22:11:58 +08:00
luoliming c2e615e949 4 2024-02-15 21:02:50 +08:00
luoliming 3726ebbe16 记录子表Bom版本行ID 2024-02-13 17:42:31 +08:00
luoliming ca9dee8eea 记录子表Bom版本行ID 2024-02-13 17:38:01 +08:00
luoliming fa26973ce9 子表加BOM版本rowId 2024-02-13 16:39:09 +08:00
luoliming 05ba87c822 原材料规则 2024-02-13 16:31:18 +08:00
luoliming 435589379a 原材料规则 2024-02-07 15:23:33 +08:00
luoliming d5615be227 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-02-02 15:47:30 +08:00
luoliming 2bcc599016 复制 2024-02-02 15:46:40 +08:00
luoliming 66e1a2c0f3 原材料规则 2024-01-29 22:16:46 +08:00
大米 4dad05c287 BUG修复 2024-01-29 17:03:38 +08:00
luoliming c12036ffa1 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-28 22:37:20 +08:00
luoliming f73e7bbeb9 物料,工厂规则匹配接口迁移 2024-01-28 22:36:40 +08:00
jing's b45e374683 废弃 2024-01-28 22:15:49 +08:00
jing's e0a098f218 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-28 22:12:07 +08:00
jing's b81bd49eeb 默认修改日期 2024-01-28 22:12:03 +08:00
luoliming c156fc5ca8 物料,工厂规则匹配接口迁移 2024-01-27 23:14:41 +08:00
luoliming 58bdfecebb 物料,工厂规则匹配接口迁移 2024-01-27 20:46:16 +08:00
jing's a4aa03958d 选项删除软删除 2024-01-27 17:59:03 +08:00
jing's 4383367efb 已发布选项不能删除提示 2024-01-27 17:19:44 +08:00
jing's e0531ca0e9 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-26 22:13:15 +08:00
jing's 31227e8094 导出设备顺序 2024-01-26 22:13:11 +08:00
大米 b1fd8eaca4 BUG修复 2024-01-26 18:44:34 +08:00
大米 e5e24cdf6b Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-26 18:02:11 +08:00
大米 11fba444c3 BUG修复 2024-01-26 18:02:04 +08:00
jing's 2530f56254 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-26 15:50:47 +08:00
jing's fd604e40b8 移动破调整 2024-01-26 15:50:43 +08:00
大米 8ad11de234 BUG修复 2024-01-26 14:38:25 +08:00
大米 87c322a4c7 BUG修复 2024-01-26 14:35:47 +08:00
luoliming daabfa09ac 注释获取订单号 2024-01-25 23:38:20 +08:00
luoliming 4ad663fe6f Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-25 23:08:42 +08:00
luoliming 3b83c06d31 注释获取订单号 2024-01-25 23:08:28 +08:00
jing's be45b8e310 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-25 22:57:19 +08:00
jing's 758158d262 调整 2024-01-25 22:57:15 +08:00
luoliming fb13d33228 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-25 22:18:41 +08:00
luoliming 6da9e80a76 注释获取订单号 2024-01-25 22:18:24 +08:00
jing's 992ea36b44 oa 申请 2024-01-25 22:16:25 +08:00
jing's 91885560ac 调整 2024-01-25 17:12:48 +08:00
jing's 1d8d523e0f Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-25 16:25:38 +08:00
jing's e5399295a7 导入sap 2024-01-25 16:25:34 +08:00
大米 06851c1b58 BUG修复 2024-01-25 15:06:50 +08:00
jing's 3fa277bc49 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-25 14:36:11 +08:00
jing's bb0723666d 申请物料更换 2024-01-25 14:30:34 +08:00
大米 e54e9e87c9 BUG修复 2024-01-25 12:20:08 +08:00
jing's 9998d74ffb 选中某一个物料,按回车键,然后单击更新物料行/暂存/提交时,此物料会被删除 2024-01-24 23:19:58 +08:00
jing's 7b938cfd50 模版 2024-01-24 18:06:28 +08:00
大米 36903f527a Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-24 17:08:21 +08:00
大米 621a2287f5 加1|自制;2|外协;3|采购 2024-01-24 17:08:16 +08:00
jing's 3ca4ee7606 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-24 17:02:27 +08:00
jing's 404fef34e3 暂存取消异常检查 2024-01-24 17:02:23 +08:00
大米 bc17c0cd3a 加1|自制;2|外协;3|采购 2024-01-24 11:06:57 +08:00
大米 4a9d9b5385 加1|自制;2|外协;3|采购 2024-01-24 10:06:29 +08:00
luoliming 5821052b77 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-23 23:38:01 +08:00
luoliming b1ee64a574 注释获取订单号 2024-01-23 23:37:49 +08:00
jing's eff37916b8 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-23 23:04:17 +08:00
jing's cffc7b8777 sap 导入 2024-01-23 23:04:07 +08:00
luoliming e6afa2ef26 注释获取订单号 2024-01-23 22:58:26 +08:00
jing's b65c7d3953 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
2024-01-23 21:56:41 +08:00
jing's bec67d75d5 sap 2024-01-23 21:56:02 +08:00
大米 71e5c2aec4 加1|自制;2|外协;3|采购 2024-01-23 18:51:52 +08:00
大米 e728f1d2af Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-23 18:06:56 +08:00
大米 38e9ed6d93 加1|自制;2|外协;3|采购 2024-01-23 18:06:51 +08:00
jing's 4edad1ba33 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-23 15:26:18 +08:00
jing's 9ab8a44e06 调整工厂 2024-01-23 15:25:54 +08:00
大米 c1f21f8723 加1|自制;2|外协;3|采购 2024-01-23 15:08:23 +08:00
大米 a32e3591d8 pbom 加relCategoryCode 2024-01-23 14:20:37 +08:00
大米 c20932ff1f 原始BOM搜索+虚拟包加单位 2024-01-23 12:57:50 +08:00
大米 b81a9e6cf2 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-22 12:29:38 +08:00
大米 52ce04273c 同步sap 2024-01-22 12:29:31 +08:00
jing's 0f7031bea7 调整判断 2024-01-22 10:04:19 +08:00
jing's 79637ce6f3 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-22 09:33:09 +08:00
jing's c8f4b6e697 移动破 2024-01-22 09:32:58 +08:00
大米 e8f7ef564d 同步sap 2024-01-22 08:50:38 +08:00
luoliming f7a261dbab Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-21 22:23:40 +08:00
jing's b297276412 调整 2024-01-21 22:19:32 +08:00
luoliming e81c155ca4 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
2024-01-21 22:18:22 +08:00
luoliming 0bf8ed6c1f 注释获取订单号 2024-01-21 22:16:51 +08:00
jing's eb2c62de30 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-21 22:16:41 +08:00
jing's f05ae31a57 调整 2024-01-21 22:16:37 +08:00
luoliming 67bfc6686a 同步sap 2024-01-21 22:13:28 +08:00
jing's 5014614de7 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-21 21:13:30 +08:00
jing's 26831d55d3 移动破调整 2024-01-21 21:13:25 +08:00
luoliming eb70a94864 31码需有虚拟包 2024-01-21 15:01:28 +08:00
大米 9bcea20836 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-20 11:49:33 +08:00
大米 9893678ea2 同步sap 2024-01-20 11:49:23 +08:00
jing's 82e0749c57 异常检查 2024-01-19 20:37:41 +08:00
jing's ce9596a61f 退回 2024-01-19 17:56:03 +08:00
jing's 05cc8db7db Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-19 11:42:37 +08:00
jing's 3cd755b283 退回 2024-01-19 11:42:33 +08:00
大米 5fc1a33109 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-19 10:46:49 +08:00
大米 8d560d9b4a 非Q 的规则 2024-01-19 10:46:44 +08:00
luoliming da13cbe9f0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
2024-01-18 21:34:33 +08:00
luoliming fd4969cb99 ebom 工作表 2024-01-18 21:32:14 +08:00
大米 648c2166d6 非Q 的规则 2024-01-18 11:51:38 +08:00
大米 ba97872897 1020分工厂 2024-01-18 11:39:30 +08:00
大米 b3b9a85b5f 1020分工厂 2024-01-18 11:15:57 +08:00
大米 36d810252f BUG修复 2024-01-18 10:53:22 +08:00
大米 67824540e3 同步sap 2024-01-17 12:24:11 +08:00
大米 277a658ae9 同步sap 2024-01-17 11:13:09 +08:00