jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,779 Commits 134 Branches 31 Tags
344b79d76b4cc78a59121ca3f46ca14b6ef306dc
Commit Graph

1622 Commits

Author SHA1 Message Date
guanhuan
20980bed9d 修复客供料产品下达计划,第二个计划下达报错 2025-07-14 10:54:17 +08:00
胡尧
20069d5336 Merge branch refs/heads/develop into refs/heads/release/release_2.15 2025-07-01 17:57:06 +08:00
yuxianghui
71ab241e94 产品添加坯料类型字段，值来着bfm下单 2025-06-27 15:10:15 +08:00
yuxianghui
a68d6d4d06 处理 采购订单确认时，一补货组的补货单没有合并问题 2025-06-26 16:55:38 +08:00
胡尧
c630074f4a Accept Merge Request #2262: (feature/根据项目组区分sf代码 -> develop) 
Merge Request: 撤回_run_manufacturing方法

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2262?initial=true
 2025-06-26 10:27:04 +08:00
胡尧
4bea169327 撤回_run_manufacturing方法 2025-06-26 10:26:39 +08:00
yuxianghui
e52ec3982f 调拨单验证时，对没有完成通过的质检单不进行出厂检验报告检测 2025-06-26 10:03:19 +08:00
胡尧
8123885c71 修复加工面报错的问题 2025-06-25 17:35:18 +08:00
yuxianghui
35b1d648c3 产品新增单件用量 unit_number 字段，值由bfm下单同步获得；产品生成的BOM中组件数量的值由unit_number 字段提供。 2025-06-24 15:36:23 +08:00
胡尧
832b06be1f Merge branch 'develop' into feature/根据项目组区分sf代码 2025-06-24 15:06:31 +08:00
胡尧
b177bd95ff 将fetchCNC移动到sf_mrs_connect模块 2025-06-23 11:04:44 +08:00
胡尧
a5bb686708 Accept Merge Request #2245: (feature/根据项目组区分sf代码 -> develop) 
Merge Request: 将sf_manufacturing模块中stock.py的_run_manufacture方法进行拆分

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2245?initial=true
 2025-06-23 10:54:27 +08:00
胡尧
c1bafef1aa Merge branch 'develop' into feature/根据项目组区分sf代码 2025-06-23 10:49:47 +08:00
yuxianghui
0013f9f8c9 Merge branch 'feature/委外加工采购订单原生BUG修复' into feature/委外加工bug修复 2025-06-23 08:34:14 +08:00
yuxianghui
d73ffab9b5 处理bfm下单报错 2025-06-20 10:28:07 +08:00
yuxianghui
8bd1c8a095 处理 bfm内部下单包含坯料尺寸时，生成的产品的加工参数-体积数据不正确问题 2025-06-19 16:29:31 +08:00
yuxianghui
84846fb3da bfm内部下单新增坯料长宽高同步到sf产品-加工参数-坯料尺寸的长宽高 2025-06-18 16:54:15 +08:00
yuxianghui
71a0f39ec9 新增如果采购订单类型为委外加工，则不进行供应商校验直接生成补给单 2025-06-18 10:50:13 +08:00
胡尧
92f591c3e7 将sf_manufacturing模块中stock.py的_run_manufacture方法进行拆分 2025-06-18 09:25:44 +08:00
yuxianghui
fec095ca6b Merge branch 'feature/平台下单优化' into feature/平台下单优化_1 2025-06-16 16:03:53 +08:00
yuxianghui
aed33dbb35 1、内部下单：行明细增加交期等； 2、处理 bfm平台下单-填写了合同相关字段，未上传合同，合同的相关字段未传到sf销售订单 问题 2025-06-16 16:02:43 +08:00
管欢
fb3bb8f1c0 Accept Merge Request #2198: (feature/齐套检查与下达生产 -> develop) 
Merge Request: 人工线下加工最后一个工单完工后未记录时间完工时间

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2198
 2025-06-16 14:44:40 +08:00
胡尧
af1bc021d6 在调拨单验证前，先进行设置数量 2025-06-16 14:24:50 +08:00
guanhuan
2febc369bb 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 2025-06-16 13:44:55 +08:00
guanhuan
fa03b562a2 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 2025-06-16 11:52:22 +08:00
guanhuan
5f55c954d1 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 2025-06-16 11:42:21 +08:00
胡尧
dba38f4d37 修改产品名称 2025-06-16 10:50:56 +08:00
胡尧
1811dbf0fd 解决修改产品名称带来的影响 2025-06-16 09:33:52 +08:00
胡尧
347019d7ee 修改产品名称生成规则 2025-06-16 09:20:32 +08:00
胡尧
f53e34aeb4 修改接口授权后，没有赋予用户的bug，导致无法获取公司，增加替换sf销售订单行产品名称的模块 2025-06-13 17:53:57 +08:00
胡梓杨
960f05090c Accept Merge Request #2187: (feature/6973 -> develop) 
Merge Request: 货位看板详情回退显示错误修复，删除幽灵卡片。

Created By: @胡梓杨
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @胡梓杨
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2187
 2025-06-12 15:48:03 +08:00
管欢
9cbd311fec Accept Merge Request #2183: (feature/需求计划 -> develop) 
Merge Request: 需求计划

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2183
 2025-06-11 09:22:25 +08:00
管欢
39a25bb6c8 Accept Merge Request #2180: (feature/搜索优化 -> develop) 
Merge Request: 采购申请单完成操作提示调整

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2180
 2025-06-10 16:33:37 +08:00
guanhuan
9cf2bac9c6 修复返工问题 2025-06-09 17:39:55 +08:00
huziyang@jikimo.com
23dd88b7ba 解决冲突 2025-06-09 10:01:57 +08:00
huziyang@jikimo.com
f164488e48 屏蔽OCC导入 2025-06-09 09:59:47 +08:00
yuxianghui
5d0f094da7 1 2025-06-05 17:03:06 +08:00
yuxianghui
95cb5251dc 1、销售订单添加合同编号字段，bfm下单接口添加合同编号同步；2、优化解除装夹工单完工时解绑rfid逻辑，优化工单返工时新工单绑定rfid逻辑 2025-06-05 16:59:33 +08:00
yuxianghui
2b3a2dd21c 1、处理返工报错，2、保存的合同文档添加对应销售订单号 2025-06-05 09:16:02 +08:00
yuxianghui
573b50da68 销售订单添加合同字段，销售订单form页面新增合同page页，优化/api/bfm_process_order/list接口添加合同信息处理。 2025-06-04 11:31:28 +08:00
guanhuan
9b01254b3c 下达生产 2025-05-28 10:47:03 +08:00
胡尧
30a6e5bf2e 制造订单的编程记录修改 2025-05-26 09:31:47 +08:00
yuxianghui
981569170c Merge branch 'feature/销售委外加工按钮优化_1' into feature/中控接口优化 2025-05-22 11:04:48 +08:00
yuxianghui
3a9cd3f39d 1、获取日计划接口优化；2、货位信息接口优化； 2025-05-22 11:04:06 +08:00
管欢
1856a1a4ef Accept Merge Request #2134: (feature/搜索优化 -> develop) 
Merge Request: 采购申请按钮优化

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2134
 2025-05-19 11:04:44 +08:00
guanhuan
52579673de 采购申请单完成操作优化 2025-05-19 08:54:02 +08:00
胡尧
4b443e65f6 解决库存单据零件图号零件名称不对的问题 2025-05-16 09:14:37 +08:00
胡尧
a3c0fd3ccf 解决工艺外协采购单不显示的问题 2025-05-15 16:48:34 +08:00
胡尧
a29265f17d 修改正则匹配成品名字序号 2025-05-15 16:39:57 +08:00
胡尧
c2e4085b50 解决产品模板复制的问题 2025-05-15 12:14:33 +08:00