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

Commit Graph

  • 4269ce58db Accept Merge Request #1668: (feature/消息提醒优化 -> develop) 管欢 2024-12-30 11:37:04 +08:00
  • 3555be86c6 提示优化 guanhuan 2024-12-30 11:35:08 +08:00
  • 764472111f Accept Merge Request #1667: (feature/part_number -> develop) 廖丹龙 2024-12-30 10:31:05 +08:00
  • ce4fc8b8ab 批量调拨 liaodanlong 2024-12-30 10:29:29 +08:00
  • 67f4917491 Accept Merge Request #1666: (feature/制造功能优化 -> develop) 马广威 2024-12-30 10:02:51 +08:00
  • ad885f1e39 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-30 10:02:09 +08:00
  • 993d720c40 sf-采购询价单【上传合同】按钮展示条件修改 mgw 2024-12-30 10:01:43 +08:00
  • da75a8cd35 Accept Merge Request #1665: (feature/夹具物料查询优化_1 -> develop) 禹翔辉 2024-12-30 09:59:32 +08:00
  • b35f842915 调整托盘解绑修改顺序 yuxianghui 2024-12-30 09:57:36 +08:00
  • 4e7993d035 追溯参考号 guanhuan 2024-12-30 09:56:49 +08:00
  • 946f02003e Accept Merge Request #1664: (feature/夹具物料查询优化_1 -> develop) 禹翔辉 2024-12-30 09:54:58 +08:00
  • 435315a166 Merge branch 'feature/夹具物料查询优化' into feature/夹具物料查询优化_1 yuxianghui 2024-12-30 09:53:49 +08:00
  • 676f8eb7eb 添加点击工单的解绑托盘按钮时，修改对应托盘状态为空闲 yuxianghui 2024-12-30 09:52:32 +08:00
  • 6e9f66506a Accept Merge Request #1663: (feature/消息提醒优化 -> develop) 管欢 2024-12-30 09:48:30 +08:00
  • f3e08f5ccc 新增零件名称,零件图号 guanhuan 2024-12-30 09:43:20 +08:00
  • c9d7d70d3c Accept Merge Request #1662: (feature/part_number -> develop) 廖丹龙 2024-12-30 09:41:08 +08:00
  • ee6e457bbd 委外加工采购单与制造订单进行关联 liaodanlong 2024-12-30 09:38:51 +08:00
  • ab5b4c477f 新增零件名称,零件图号 guanhuan 2024-12-30 09:33:00 +08:00
  • 9330be3753 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-30 08:57:49 +08:00
  • a3a2c96d00 添加紧急采购字段 mgw 2024-12-30 08:57:05 +08:00
  • 31187755b9 Accept Merge Request #1661: (feature/夹具物料查询优化 -> develop) 禹翔辉 2024-12-30 08:42:16 +08:00
  • 178f538997 Merge branch 'feature/销售、采购页面优化' into feature/夹具物料查询优化 yuxianghui 2024-12-30 08:34:58 +08:00
  • 304f6ad5ba Accept Merge Request #1659: (feature/part_number -> develop) 马广威 2024-12-28 14:55:55 +08:00
  • 8b40714dad 销售订单交付状态修改 liaodanlong 2024-12-28 14:55:17 +08:00
  • cb8e415e60 Accept Merge Request #1658: (feature/part_number -> develop) 马广威 2024-12-28 14:30:47 +08:00
  • 889049b107 表面工艺确认回退再重新确认调拨单报错问题 liaodanlong 2024-12-28 14:28:34 +08:00
  • 610028c5f4 Accept Merge Request #1657: (feature/part_number -> develop) 廖丹龙 2024-12-28 09:13:42 +08:00
  • abfac28094 sorted_workorders变量过滤 liaodanlong 2024-12-28 09:12:27 +08:00
  • 24d8d37e0a Accept Merge Request #1656: (feature/part_number -> develop) 廖丹龙 2024-12-28 09:08:20 +08:00
  • 6780d4e758 sorted_workorders变量定义 liaodanlong 2024-12-28 09:07:02 +08:00
  • 0fd64aee38 Merge branch 'refs/heads/develop' into feature/customer_material_optimization feature/customer_material_optimization liaodanlong 2024-12-28 08:45:25 +08:00
  • a1d4e74056 Accept Merge Request #1655: (feature/制造功能优化 -> develop) 马广威 2024-12-28 08:26:44 +08:00
  • 3c8fbcf9f9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-28 08:24:55 +08:00
  • c0bb07efb2 修改提示方式 mgw 2024-12-28 08:24:31 +08:00
  • 675fb54d37 夹具物料查询优化 yuxianghui 2024-12-27 17:28:24 +08:00
  • ead54cfc87 Accept Merge Request #1654: (feature/part_number -> develop) 廖丹龙 2024-12-27 17:08:40 +08:00
  • e990f24615 两张外协工单报错问题 liaodanlong 2024-12-27 16:21:36 +08:00
  • dc871e0a1d Accept Merge Request #1653: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-27 13:57:06 +08:00
  • f71246e9fb 解决冲突 胡尧 2024-12-27 13:56:41 +08:00
  • 133c1a87f2 修改消息通知 胡尧 2024-12-27 13:53:10 +08:00
  • 6f14a39347 Accept Merge Request #1652: (feature/消息提醒优化 -> develop) 管欢 2024-12-26 17:18:09 +08:00
  • 6e2ee60616 工单已下发提醒 guanhuan 2024-12-26 17:15:48 +08:00
  • 3efb30cece Accept Merge Request #1651: (feature/制造功能优化 -> develop) 马广威 2024-12-26 16:35:57 +08:00
  • e56df3d7b9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-26 16:34:11 +08:00
  • 253a06ceaf 修改确认订单时的判定逻辑，调整提示词 mgw 2024-12-26 16:33:43 +08:00
  • 28c6c841be Accept Merge Request #1650: (feature/销售、采购页面优化 -> develop) 禹翔辉 2024-12-26 16:32:56 +08:00
  • f948bf445a Merge branch 'feature/无效刀自动返工优化' into feature/销售、采购页面优化 yuxianghui 2024-12-26 16:29:27 +08:00
  • 1b278a1432 1、订单详情字段显示优化；2、采购单页面优化 yuxianghui 2024-12-26 16:28:39 +08:00
  • 3fcb3b250f Accept Merge Request #1649: (feature/制造功能优化 -> develop) 马广威 2024-12-26 15:44:28 +08:00
  • 57c689b03b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-26 15:43:51 +08:00
  • 158ca95dbb 去掉对审批的跳过 mgw 2024-12-26 15:42:43 +08:00
  • e059d9266d 坯料发料提醒 guanhuan 2024-12-26 15:26:12 +08:00
  • 8de2a59b88 Accept Merge Request #1648: (feature/制造功能优化 -> develop) 马广威 2024-12-26 14:48:01 +08:00
  • 9ac60ae283 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-26 14:47:20 +08:00
  • 07356b5bb2 sf-询价单-【发起审批】按钮，及必填字段问题 mgw 2024-12-26 14:46:17 +08:00
  • 96c79a78ab Accept Merge Request #1647: (feature/无效刀自动返工优化 -> develop) 禹翔辉 2024-12-26 13:55:49 +08:00
  • b03eafcf94 取消自动返工时修改制造订单状态 yuxianghui 2024-12-26 13:54:59 +08:00
  • 0b7d7959c5 Accept Merge Request #1646: (feature/无效刀自动返工优化 -> develop) 禹翔辉 2024-12-26 13:25:05 +08:00
  • 40865b7c6c 取消制造订单功能刀具状态为无效刀时自动返工修改制造订单的状态； yuxianghui 2024-12-26 13:24:04 +08:00
  • 8abb6447d2 Accept Merge Request #1645: (feature/制造功能优化 -> develop) 马广威 2024-12-26 13:17:33 +08:00
  • 394c3f9870 调整按钮位置 mgw 2024-12-26 13:16:04 +08:00
  • b254624d68 Accept Merge Request #1644: (feature/制造功能优化 -> develop) 马广威 2024-12-26 11:28:47 +08:00
  • 87b2c0b0f8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-26 11:22:53 +08:00
  • b0e993dd53 完善采购合同上传功能 mgw 2024-12-26 11:22:16 +08:00
  • 79183761ae Accept Merge Request #1642: (feature/part_number -> develop) 廖丹龙 2024-12-26 10:20:43 +08:00
  • c448088906 采购单关联产品 liaodanlong 2024-12-26 10:18:17 +08:00
  • a7a1779e61 Accept Merge Request #1643: (feature/销售订单优化 -> develop) 禹翔辉 2024-12-26 10:03:13 +08:00
  • 06842c6df9 1、采购入库，选取目标货位去重校验优化；2、添加功能刀具自动计算当前目标货位的值； yuxianghui 2024-12-26 10:01:42 +08:00
  • 6532af500f 质量检测添加零件图号与零件名称 liaodanlong 2024-12-26 08:57:31 +08:00
  • 1fb88960db Merge branch 'refs/heads/develop' into feature/part_number liaodanlong 2024-12-25 17:29:48 +08:00
  • 4c8071fea2 多制造订单生成工艺有误 liaodanlong 2024-12-25 17:16:30 +08:00
  • 4aac3d42b6 Accept Merge Request #1641: (feature/销售订单优化 -> develop) 禹翔辉 2024-12-25 17:14:44 +08:00
  • 0f4d25abb4 Merge branch 'feature/工单按钮优化' into feature/销售订单优化 yuxianghui 2024-12-25 17:13:24 +08:00
  • 14cc285ee2 1、销售订单供货方式为委外加工时生成的采购单问题优化 yuxianghui 2024-12-25 17:12:38 +08:00
  • 54b896004b Accept Merge Request #1640: (feature/part_number -> develop) 廖丹龙 2024-12-25 15:16:26 +08:00
  • 7a1237ddf8 时间获取修改 liaodanlong 2024-12-25 15:14:07 +08:00
  • f80aaf978b Accept Merge Request #1639: (feature/part_number -> develop) 廖丹龙 2024-12-25 14:57:16 +08:00
  • 64f35b5633 工艺确认统一工艺设计 liaodanlong 2024-12-25 14:49:05 +08:00
  • 9e887076f2 Accept Merge Request #1638: (feature/工单按钮优化 -> develop) 禹翔辉 2024-12-25 14:20:31 +08:00
  • 78fff46452 1、制造订单状态优化 yuxianghui 2024-12-25 14:16:34 +08:00
  • a6d4f99710 Accept Merge Request #1637: (feature/工单按钮优化 -> develop) 禹翔辉 2024-12-25 13:22:25 +08:00
  • 05f1f1a983 去除工单多余的开始按钮 yuxianghui 2024-12-25 13:13:38 +08:00
  • f719135abb Accept Merge Request #1636: (feature/制造、采购优化 -> develop) 禹翔辉 2024-12-25 13:05:14 +08:00
  • 82983871fc Merge branch 'feature/制造订单优化' into feature/制造、采购优化 yuxianghui 2024-12-25 13:03:44 +08:00
  • 7f17ff8b78 1、处理制造订单返工确认后，状态还是返工的bug；2、隐藏已取消状态的采购单【确认订单】按钮 yuxianghui 2024-12-25 13:02:49 +08:00
  • 9efece315f Accept Merge Request #1635: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-25 11:32:36 +08:00
  • d82cb1e64c 解决手工创建表面工艺采购单由于没有源单据报错 胡尧 2024-12-25 11:31:27 +08:00
  • 7ab2894ae8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-25 11:02:29 +08:00
  • 0991888494 采购合同上传基础功能 mgw 2024-12-25 11:02:00 +08:00
  • 42937bcf76 Accept Merge Request #1634: (feature/制造订单优化 -> develop) 禹翔辉 2024-12-25 09:43:29 +08:00
  • 32fb6eadbc 1 yuxianghui 2024-12-25 09:43:04 +08:00
  • 5a1ebabc87 处理没有工单时，制造订单就已经完成的问题 yuxianghui 2024-12-25 09:41:07 +08:00
  • 57f51d7cfa Accept Merge Request #1633: (feature/制造功能优化 -> develop) 马广威 2024-12-24 20:42:18 +08:00
  • d2ec0cacc3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-24 17:27:36 +08:00
  • aaf3b20e65 询价单字段排版及增加逻辑验证 mgw 2024-12-24 17:27:08 +08:00
  • 5912a170f1 Accept Merge Request #1632: (feature/制造订单优化 -> develop) 禹翔辉 2024-12-24 17:21:36 +08:00
  • ed3feaf2a0 优化制造订单状态方法 yuxianghui 2024-12-24 17:17:53 +08:00
  • d953f4e4a0 Merge branch 'feature/采购、外协优化' into feature/制造订单优化 yuxianghui 2024-12-24 16:48:19 +08:00
  • c2d346282c 1、制造订单隐藏不必的取消按钮、添加取消按钮的隐藏条件；2、添加返工完成后制造订单状态置为加工中 yuxianghui 2024-12-24 16:47:10 +08:00
  • 9d85f56af3 Accept Merge Request #1631: (feature/消息提醒优化 -> develop) 管欢 2024-12-24 15:00:25 +08:00