jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 7152b54017 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版返工 jinling.yang 2024-07-11 17:38:38 +08:00
  • 0fef714d61 1.注释mrp_workcenter.xml文件和res.config添加不要的字段:lost_agent_id 2.制造订单新增“重新编程次数”字段,新增更新程序方法及对应的接口,优化返工且编程中的制造订单定时获取Cloud编程单状态的方法 3.优化返工向导页面及新增“重复编程次数”和“编程状态”字段 jinling.yang 2024-07-11 17:37:35 +08:00
  • 6a2ff72dce Accept Merge Request #1146: (feature/销售单优化 -> develop) 禹翔辉 2024-07-11 16:40:39 +08:00
  • 3094379e86 1、在销售订单内产品列表内增加备注字段 yuxianghui 2024-07-11 16:38:41 +08:00
  • 77815c45a0 1、当检测到缺刀工单需要的功能刀具从刀具房出库到线边刀架时，更改cnc编程单的功能刀具状态为正常； yuxianghui 2024-07-11 16:37:20 +08:00
  • dd7c69ce1b Accept Merge Request #1145: (feature/优化制造功能 -> develop) 马广威 2024-07-11 11:23:05 +08:00
  • e02f792300 修改订单状态 mgw 2024-07-11 11:22:25 +08:00
  • 9aca786522 1.优化工单排序2.新增调取cloud编程单的状态方法3.制造订单添加状态为返工及编程状态为"已编程"，“已编程未下发”的过滤条件4，新增返工且编程中的制造订单定时获取Cloud编程单状态的定时器 jinling.yang 2024-07-10 17:36:26 +08:00
  • 134e23ea2f 1、重构工单工序的生成方法； yuxianghui 2024-07-10 16:25:18 +08:00
  • 129f8a4d7d 1、重构工单cnc编程用刀校验方法；制造订单、工单、cnc编程单添加刀具状态字段，并且根据cnc编程单刀具状态自动计算制造订单、工单刀具状态字段的值；制造订单form页新增展示功能刀具状态字段；2、功能刀具拆解单刀具物料选择目标货位添加过滤添加为只选择所属货区是刀具房的货位； yuxianghui 2024-07-10 16:23:24 +08:00
  • 79e3006cdb Accept Merge Request #1144: (feature/优化制造功能 -> develop) 马广威 2024-07-10 16:05:49 +08:00
  • 6b140fe6dd 优化工单模块，增加企微模块 mgw 2024-07-10 15:58:47 +08:00
  • 7533d23d3e 1.工单状态新增‘返工’，2，在制造订单上点击返工选择加工面确认后，新增加工面的对应工单及新增重置cloud的编程单的状态3.优化返工向导 jinling.yang 2024-07-09 17:36:47 +08:00
  • e8512b23e4 Accept Merge Request #1143: (feature/优化制造功能 -> develop) 马广威 2024-07-09 17:32:54 +08:00
  • b582bfbafa 增加工单模块 mgw 2024-07-09 17:32:03 +08:00
  • 11907d4c5e Accept Merge Request #1142: (feature/优化制造功能 -> develop) 马广威 2024-07-09 10:19:20 +08:00
  • ed4903b6f1 解除装夹处打印成品二维码 mgw 2024-07-09 10:18:13 +08:00
  • b383a6d229 1.新增加工面模型2.制造订单详情页面的返工操作上的加工面根据产品的加工面板进行过滤 jinling.yang 2024-07-08 17:33:04 +08:00
  • 27eb959a2a Accept Merge Request #1141: (feature/功能刀具拆解单库存优化 -> develop) 禹翔辉 2024-07-08 09:57:04 +08:00
  • 1672a3982e 1、完成 SF材料材料型号缺陷优化 bug yuxianghui 2024-07-05 17:09:32 +08:00
  • 40f8392bd3 Accept Merge Request #1140: (feature/前端样式修改 -> develop) 黄焱 2024-07-05 16:05:38 +08:00
  • 1c8644983b 去除 根据进度条设置水印 修复切换产品3D图bug 修改表格下拉框会被表格下面数据框覆盖的bug hy 2024-07-05 16:02:32 +08:00
  • 566d9fce9c Accept Merge Request #1139: (feature/优化制造功能 -> develop) 马广威 2024-07-05 11:37:24 +08:00
  • b071b14bbd 优化展示效果 mgw 2024-07-05 11:36:48 +08:00
  • 9d95442720 Accept Merge Request #1138: (feature/优化制造功能 -> develop) 马广威 2024-07-05 11:27:02 +08:00
  • fd225fa0e1 工作中心的参数修改需增加sns模块("记录备注") mgw 2024-07-05 11:26:02 +08:00
  • 52fa229896 优化制造订单菜单 jinling.yang 2024-07-04 17:31:03 +08:00
  • 937efa5f0f Accept Merge Request #1137: (feature/优化制造功能 -> develop) 马广威 2024-07-04 17:22:25 +08:00
  • 87153fab3f 前置检测文件命名增加加工面标识，避免检测文件覆盖 mgw 2024-07-04 17:21:39 +08:00
  • 21c33bb662 Accept Merge Request #1136: (feature/优化制造功能 -> develop) 马广威 2024-07-04 16:19:46 +08:00
  • b0da7977f5 修复“已经排程的制造订单取消排程后状态没有回退” mgw 2024-07-04 16:19:20 +08:00
  • ae6764495e Accept Merge Request #1135: (feature/优化制造功能 -> develop) 马广威 2024-07-04 16:13:30 +08:00
  • 869e3e4b4f 修复”制造订单完工后对应的成品入库单还是等待状态-应该是就绪状态“ mgw 2024-07-04 16:12:27 +08:00
  • 050e82673a 优化cnc工单 jinling.yang 2024-07-04 15:38:43 +08:00
  • 1210625cfc Accept Merge Request #1134: (release/release_2.0 -> develop) 杨金灵 2024-07-04 15:37:25 +08:00
  • 804b401a87 Accept Merge Request #1133: (release/release_2.0 -> master) 马广威 2024-07-03 21:33:49 +08:00
  • a7a8e73616 新增返工向导 jinling.yang 2024-07-03 17:35:29 +08:00
  • d60fefb2ec 1 yuxianghui 2024-07-03 17:33:29 +08:00
  • 4a86871039 1、功能刀具组装单添加对应调拨单跳转按钮；功能刀具拆解单添加调拨单跳转按钮和功能刀具移动跳转按钮；2、功能刀具拆解模型，form视图添加报废page页存放刀具物料报废单，优化拆解流程添加功能刀具拆解移动记录；3、功能刀具出入库列表视图添加拆解单跳转链接；4、功能刀具安全库存模型添加名称唯一验证，优化字段计算方法；5、优化功能刀具同步到cloud的同步接口，解决编码问题； yuxianghui 2024-07-03 17:17:48 +08:00
  • 93c3548b40 注释OCC代码 jinling.yang 2024-07-03 11:05:55 +08:00
  • 6c6fe44d45 制造订单去掉上/下产线字段 release/release_2.0 hotfix/修复多面加工产线状态 jinling.yang 2024-07-03 10:53:29 +08:00
  • bb33a1d093 修复多面工单产线状态 jinling.yang 2024-07-03 10:37:02 +08:00
  • 396084a498 Accept Merge Request #1132: (feature/修复多面加工产线状态 -> develop) 杨金灵 2024-07-03 10:32:42 +08:00
  • 73cc244994 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复多面加工产线状态 jinling.yang 2024-07-03 10:30:27 +08:00
  • fa6303bbef 修复多面工单加工产线状态 jinling.yang 2024-07-03 10:30:13 +08:00
  • 5ca555c520 Accept Merge Request #1131: (feature/修复多面加工产线状态 -> develop) 杨金灵 2024-07-03 10:00:29 +08:00
  • 487f6c2054 修复多面加工产线状态 jinling.yang 2024-07-03 09:55:47 +08:00
  • 9ec37f5d5b 修复多面加工产线状态 jinling.yang 2024-07-03 09:45:55 +08:00
  • cbc8a41984 1、添加拆解的仓库管理地点；2、优化功能刀具拆解库存管理；3、代码迁移 yuxianghui 2024-07-02 17:32:27 +08:00
  • 025ad213d6 Merge branch 'feature/功能刀具组装库存优化' into feature/功能刀具拆解单库存优化 yuxianghui 2024-07-02 10:24:52 +08:00
  • 0b267cc88a 1 yuxianghui 2024-07-02 09:32:50 +08:00
  • 0bc4072a8f Accept Merge Request #1130: (release/release_1.9 -> master) 马广威 2024-07-01 22:35:53 +08:00
  • 957c5583bd Accept Merge Request #1129: (feature/修复制造订单数量 -> develop) release/release_1.9 马广威 2024-07-01 20:13:10 +08:00
  • 9c4c2b85dd 修复制造订单数量 jinling.yang 2024-07-01 20:08:46 +08:00
  • 56af286500 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-01 18:30:18 +08:00
  • cc83029c72 Merge branch 'feature/修复工单完成接口' into develop jinling.yang 2024-07-01 18:30:06 +08:00
  • 79ab1cc573 Accept Merge Request #1128: (feature/修复工单完成接口 -> develop) 杨金灵 2024-07-01 18:29:29 +08:00
  • bda3df7806 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-01 18:29:16 +08:00
  • 150b684354 Accept Merge Request #1127: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-07-01 18:28:37 +08:00
  • d69dc20fd1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工单完成接口 jinling.yang 2024-07-01 18:28:11 +08:00
  • e9c9b77112 修复所有工单完成报库存问题 jinling.yang 2024-07-01 18:27:59 +08:00
  • 495f92bd80 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-07-01 18:27:52 +08:00
  • 8a97fd08e2 Accept Merge Request #1126: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-07-01 18:18:19 +08:00
  • 1551ea4b12 状态补充条件 mgw 2024-07-01 18:17:48 +08:00
  • 75c5cca9a0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-01 18:12:25 +08:00
  • 6b6be85057 去掉更改制造订单的状态等相关代码 jinling.yang 2024-07-01 18:12:15 +08:00
  • 7fb3c32d07 修复工单完成接口 jinling.yang 2024-07-01 17:48:45 +08:00
  • 8203975142 Accept Merge Request #1125: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-07-01 17:28:45 +08:00
  • 449cf5bfb1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-07-01 17:28:07 +08:00
  • d7d5ccc142 优化订单状态条件及物流的容错处理 mgw 2024-07-01 17:27:52 +08:00
  • 8710df6dc2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-01 17:14:42 +08:00
  • f5c1457707 Merge branch 'feature/优化解绑rfid' into develop jinling.yang 2024-07-01 17:13:57 +08:00
  • 5155135cb4 Accept Merge Request #1124: (feature/优化解绑rfid -> develop) 杨金灵 2024-07-01 17:13:38 +08:00
  • 4421eed1d0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-01 17:11:47 +08:00
  • 5be5e8b3ec 1、功能刀具组装完成时，自动生成内部调拨单以及所有的刀具物料的库存移动和移动历史记录，并自动完成该调拨单；优化功能刀具的刀具组装入库单的生成，简化入库步骤。 yuxianghui 2024-07-01 17:11:44 +08:00
  • 46e3a23492 优化解绑rfid jinling.yang 2024-07-01 17:11:34 +08:00
  • 675b09390b Accept Merge Request #1123: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-07-01 16:57:22 +08:00
  • 34251b4027 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-07-01 16:56:43 +08:00
  • c4621d36a3 优化订单状态 mgw 2024-07-01 16:56:19 +08:00
  • 7bdc4b463a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-01 15:42:22 +08:00
  • ea88b5418f Merge branch 'feature/优化cnc工单接口' into develop jinling.yang 2024-07-01 15:42:10 +08:00
  • f5a64caf81 Accept Merge Request #1122: (feature/优化cnc工单接口 -> develop) 杨金灵 2024-07-01 15:41:52 +08:00
  • 1e5f26d645 工单开始和结束接口增加rfid_code不为空的条件 jinling.yang 2024-07-01 15:29:55 +08:00
  • ace32d9490 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-01 14:03:23 +08:00
  • 5db2f1fc70 Accept Merge Request #1121: (feature/sf物流方面缺陷与优化 -> develop) 马广威 2024-07-01 11:51:37 +08:00
  • 960c940505 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化 mgw 2024-07-01 11:50:49 +08:00
  • ee1629b40a 优化物流提示 mgw 2024-07-01 11:47:51 +08:00
  • 06de5f6a2d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-01 10:50:19 +08:00
  • c1eff705c2 Merge branch 'feature/修复表面工艺' into develop jinling.yang 2024-07-01 10:49:57 +08:00
  • 8e3c7f9732 Accept Merge Request #1120: (feature/修复表面工艺 -> develop) 杨金灵 2024-07-01 10:49:38 +08:00
  • 2591e627f0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺 jinling.yang 2024-07-01 10:47:33 +08:00
  • 4c66d86ee6 修复表面工艺 jinling.yang 2024-07-01 10:47:05 +08:00
  • d4bc1c13ea Accept Merge Request #1119: (feature/工单优化-2 -> develop) 禹翔辉 2024-07-01 09:55:21 +08:00
  • 4c845ee9fd Merge branch 'feature/工单优化-1' into feature/工单优化-2 yuxianghui 2024-07-01 09:53:11 +08:00
  • 726c3aede1 1、优化工单扫描绑定托盘的提示信息 yuxianghui 2024-07-01 09:52:16 +08:00
  • 871c406c09 Accept Merge Request #1118: (feature/前端样式修改 -> develop) 黄焱 2024-07-01 09:49:05 +08:00
  • 2ba9695c34 // 修复表格内容覆盖表头bug hy 2024-07-01 09:47:50 +08:00
  • e1db34f25d Accept Merge Request #1117: (feature/修复无外协单和程序单 -> develop) 杨金灵 2024-07-01 09:31:43 +08:00
  • e496555ff3 去掉注释代码 jinling.yang 2024-06-30 19:29:36 +08:00
  • 404a41294c 修复表面工艺外协单状态 jinling.yang 2024-06-30 19:16:48 +08:00