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

Commit Graph

  • 40f327ea17 修改工件拆卸 胡尧 2024-09-10 16:13:57 +08:00
  • 44a2604dbd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-10 16:13:17 +08:00
  • 0ae7424f04 获取数据按钮增加调用服务功能 mgw 2024-09-10 16:12:24 +08:00
  • 091af92e8d Accept Merge Request #1290: (feature/update_production_line -> develop) 胡嘉莹 2024-09-10 15:56:16 +08:00
  • 3ed338ed64 修改计划-生产订单列表只显示制造订单 hujiaying 2024-09-10 14:50:24 +08:00
  • 65781570e7 修改计划-生产订单列表只显示制造订单 hujiaying 2024-09-10 14:38:25 +08:00
  • e1f7aeaa96 修改字段位置 liaodanlong 2024-09-10 13:53:23 +08:00
  • a0a580588c Accept Merge Request #1289: (feature/update_production_line -> develop) 胡嘉莹 2024-09-10 11:26:52 +08:00
  • a2f2a21a4c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-10 11:17:23 +08:00
  • 1ddb446bc6 修改计划排程单小时产能取值 hujiaying 2024-09-10 11:15:00 +08:00
  • dcdc6851b6 Accept Merge Request #1288: (feature/tax_sync -> develop) 廖丹龙 2024-09-10 09:23:31 +08:00
  • ece4e56118 Merge branch 'refs/heads/develop' into feature/tax_sync liaodanlong 2024-09-10 09:19:48 +08:00
  • 7cd104c047 bom物料清单添加错误信息，添加刀具物料字段展示 liaodanlong 2024-09-10 09:18:43 +08:00
  • 80a7dd75c8 Merge branch 'feature/功能刀具重构' into feature/功能刀具重构_1 yuxianghui 2024-09-10 08:28:47 +08:00
  • ec2ef752b3 补充模块注释 hujiaying 2024-09-09 18:04:10 +08:00
  • 57d5c57048 Accept Merge Request #1287: (feature/tax_sync -> develop) 廖丹龙 2024-09-09 18:00:55 +08:00
  • 9b7c22c35e 1、对组装单物料批次号获取逻辑进行优化，更改form视图批次字段显示条件；2、开发 寿命到期功能刀具完成拆解后关联生成并跳转到组装单的需求 需求 yuxianghui 2024-09-09 17:54:10 +08:00
  • 6711f6f6e6 Merge branch 'refs/heads/develop' into feature/tax_sync liaodanlong 2024-09-09 17:37:21 +08:00
  • 7ac7077f8c bom物料清单 liaodanlong 2024-09-09 17:36:23 +08:00
  • ed20249988 Accept Merge Request #1286: (feature/流程用扫码完成 -> develop) 胡尧 2024-09-09 17:31:25 +08:00
  • dba8d23348 销售订单价格问题 liaodanlong 2024-09-09 17:11:33 +08:00
  • ab9062983c Accept Merge Request #1285: (feature/update_production_line -> develop) 胡嘉莹 2024-09-09 14:16:31 +08:00
  • 37493a4688 sf计划排程计算排程时间日排程的制造订单总数量不能超过产线日产能数量，计算排程时间制造订单每小时排程不能超过产线小时产能 hujiaying 2024-09-09 14:08:39 +08:00
  • 689d149edc Accept Merge Request #1282: (feature/仓库发货下发bfm -> develop) 胡嘉莹 2024-09-09 11:02:17 +08:00
  • 9b9106c5da Accept Merge Request #1283: (feature/优化设备维保标准 -> develop) 管欢 2024-09-09 10:53:20 +08:00
  • 9a43af98c3 cloud 与 sf 静态资源同步问题 liaodanlong 2024-09-09 10:46:05 +08:00
  • 1eae92f2b2 1、功能刀具组装单添加物料校验标签字段、新增扫描校验功能、优化相关计算方法；2、添加新旧、粗中精字段值根据所选物料自动计算方法，伸出长自动计算方法；3、去除部分字段的校验方法；4、组装单form、tree视图布局调整，tree视图状态字段添加背景颜色，变更筛选条件； yuxianghui 2024-09-06 17:55:59 +08:00
  • 4560bbc0ed sf计划排程计算生产线是否配置生产线，计算排程时间是否在工作时间内，计算生产线是否有可排程的资源， hujiaying 2024-09-06 17:48:27 +08:00
  • 2d5ef0aae4 解除装夹起点从下产线agv调度任务关联带出 胡尧 2024-09-06 15:34:30 +08:00
  • f230ad55fb Accept Merge Request #1284: (hotfix/修复报废-外协入库验证 -> master) 杨金灵 2024-09-06 13:47:55 +08:00
  • 096542c8ff 扫码触发按键功能 胡尧 2024-09-06 09:37:05 +08:00
  • d123ca5173 修改日有效工作时长计算规则 hujiaying 2024-09-06 09:13:38 +08:00
  • 388929f207 扫码触发按键功能 胡尧 2024-09-05 17:59:55 +08:00
  • 29b9223a14 1、将功能刀具组装弹窗模型的组装流程以及其中相关的业务逻辑，移动到组装单模型并进行优化；2、功能刀具组装单模型新增部分字段的自动计算方法；新增部分物料字段； yuxianghui 2024-09-05 17:57:23 +08:00
  • cf283377cd 计划排程考虑CNC生产线日产能的优化需求,新增可用机台数量，单台小时产能，日有效工作时长计算规则 hujiaying 2024-09-05 17:39:36 +08:00
  • 5f218e69d4 计划排程考虑CNC生产线日产能的优化需求,新增可用机台数量，单台小时产能，日有效工作时长计算规则 hujiaying 2024-09-05 17:39:09 +08:00
  • 7f5fb165de Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-05 10:30:21 +08:00
  • eec79d7d3e 优化图片返回为url mgw 2024-09-05 10:30:04 +08:00
  • 00809d88f6 修改打印日志 feature/仓库发货下发bfm hujiaying 2024-09-05 09:53:32 +08:00
  • 18b0cc6ea0 Merge remote-tracking branch 'origin/develop' into feature/仓库发货下发bfm hujiaying 2024-09-05 09:38:40 +08:00
  • 54d9902ae4 撤回修改 hujiaying 2024-09-05 09:26:05 +08:00
  • eff39a39e3 修改 cloud端新建表面工艺参数必填参数不能填写 hujiaying 2024-09-05 09:24:45 +08:00
  • 005a7bb68e 建立设备维保标准,建立设备维保标准修复 guanhuan 2024-09-05 08:51:36 +08:00
  • afc1701150 Accept Merge Request #1281: (feature/仓库发货下发bfm -> develop) 胡嘉莹 2024-09-04 18:24:24 +08:00
  • 72eada0639 1、功能刀具组装tree、form视图布局调整；2、部分字段内容进行调整；3、功能刀具组装单编码自动生成方法添加新逻辑； yuxianghui 2024-09-04 17:55:24 +08:00
  • 979e8a47ab Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-04 17:45:02 +08:00
  • e119a364c1 Merge branch 'feature/优化返工-保留装夹测量数据' into develop jinling.yang 2024-09-04 17:44:50 +08:00
  • c7b9bbb18d Accept Merge Request #1280: (feature/优化返工-保留装夹测量数据 -> develop) 杨金灵 2024-09-04 17:44:07 +08:00
  • 3cb3dce247 优化返工代码 jinling.yang 2024-09-04 17:43:48 +08:00
  • a7e1c89e66 还原代码 jinling.yang 2024-09-04 17:36:41 +08:00
  • ca1060ada5 去掉注释代码 jinling.yang 2024-09-04 17:33:54 +08:00
  • 69578ab054 bfm新增库存菜单，代发货菜单，处理sf一次性发货，bfm生成代发货名字规则 hujiaying 2024-09-04 17:28:26 +08:00
  • 511bed47ff 优化返工-保留装夹测量数据 jinling.yang 2024-09-04 16:58:55 +08:00
  • 26a0412649 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-04 15:00:47 +08:00
  • 4989ff773c Accept Merge Request #1279: (feature/接口暂时去掉身份验证 -> develop) 杨金灵 2024-09-04 14:59:59 +08:00
  • 04c0d68763 接口暂时去掉身份验证 jinling.yang 2024-09-04 14:58:04 +08:00
  • 589035d42b 处理采购订单代发货数量修改及创建欠单，处理sf发货单下发不需要创建欠单，处理bfm发货单下发内部管理，内部管理处理不需要创建欠单 hujiaying 2024-09-03 19:14:48 +08:00
  • 5726d50106 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-03 17:26:56 +08:00
  • 6e9c326a52 智能工厂数据同步任务的错误提示优化 liaodanlong 2024-09-03 13:56:16 +08:00
  • fc1cdf4d0e 联调接口数据，处理修改sf下发代发货，bfm接收代发货消息，下发到内部管理，处理采购订单代发货数量修改及创建欠单 hujiaying 2024-09-02 19:02:53 +08:00
  • 45178ac38b Accept Merge Request #1278: (hotfix/修复报废-外协入库验证 -> develop) 杨金灵 2024-09-02 17:48:53 +08:00
  • 09ee1c26b1 修复报废-外协入库验证 hotfix/修复报废-外协入库验证 jinling.yang 2024-09-02 17:33:06 +08:00
  • 64180ca57f Merge branch 'refs/heads/develop' into feature/tax_sync liaodanlong 2024-09-02 15:43:25 +08:00
  • 0c052a118c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-02 14:44:59 +08:00
  • cb9fd43f11 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-02 09:04:59 +08:00
  • 1dc55c2770 调整不良工单逻辑 mgw 2024-09-02 09:04:42 +08:00
  • 0ca6d46a7b 修改sf下发欠单，bfm接收下发欠单，及处理发货单的关系 hujiaying 2024-08-31 21:09:56 +08:00
  • 3624ef4755 销售订单价格问题处理 liaodanlong 2024-08-30 16:30:34 +08:00
  • f07a003f2c Accept Merge Request #1277: (hotfix/修改agv回调接口授权 -> develop) 胡尧 2024-08-30 09:46:45 +08:00
  • 0ef46407dd 将agv回调接口授权改为none hotfix/修改agv回调接口授权 胡尧 2024-08-30 09:35:08 +08:00
  • f7f3c005f8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-30 08:59:09 +08:00
  • cae5e14587 Accept Merge Request #1276: (release/release_2.3 -> master) 马广威 2024-08-29 22:02:45 +08:00
  • a2990b8f2e Accept Merge Request #1275: (feature/agv_dispatch -> develop) release/release_2.3 胡尧 2024-08-29 20:21:33 +08:00
  • 5121e455d2 修改agv相关接口请求授权用户 胡尧 2024-08-29 20:20:39 +08:00
  • 4a14fa6bf6 Accept Merge Request #1274: (feature/优化表面工艺排序 -> develop) 马广威 2024-08-29 19:55:09 +08:00
  • f251878637 优化工单工序,优化表面工艺排序 jinling.yang 2024-08-29 19:53:37 +08:00
  • 9a5aa52801 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-29 19:45:53 +08:00
  • 5b3193d3ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new jinling.yang 2024-08-29 19:45:44 +08:00
  • 52befb6233 Accept Merge Request #1273: (feature/工单优化_2 -> develop) 禹翔辉 2024-08-29 19:25:22 +08:00
  • 9ce1963d44 Merge branch 'feature/工单优化_1' into feature/工单优化_2 yuxianghui 2024-08-29 19:23:55 +08:00
  • 1b710b205f 工单优化 yuxianghui 2024-08-29 19:23:15 +08:00
  • 0d253c54c8 Accept Merge Request #1272: (feature/工单优化_1 -> develop) 禹翔辉 2024-08-29 18:19:22 +08:00
  • d2c5fdb509 优化工单 yuxianghui 2024-08-29 18:18:19 +08:00
  • 40209958f2 Accept Merge Request #1271: (feature/优化制造功能 -> develop) 马广威 2024-08-29 17:53:39 +08:00
  • 778896a670 修复验证代码 mgw 2024-08-29 17:52:56 +08:00
  • fcacf609e9 Accept Merge Request #1270: (feature/工单优化_1 -> develop) 禹翔辉 2024-08-29 17:36:11 +08:00
  • 5cd134758a Merge branch 'feature/工单工序排序方法优化' into feature/工单优化_1 yuxianghui 2024-08-29 17:33:06 +08:00
  • b8f8e90444 Merge branch 'feature/刀具组装扫码优化' into feature/工单工序排序方法优化 yuxianghui 2024-08-29 17:31:39 +08:00
  • b50a852f77 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-29 17:31:38 +08:00
  • ea94d74657 优化工单工序排序方法 yuxianghui 2024-08-29 17:30:54 +08:00
  • b5bea1f811 Merge branch 'feature/修复销售-表面工艺外协' into develop jinling.yang 2024-08-29 17:30:47 +08:00
  • 8416630593 Accept Merge Request #1269: (feature/修复销售-表面工艺外协 -> develop) 杨金灵 2024-08-29 17:30:32 +08:00
  • 6572ca25fe 优化提示 jinling.yang 2024-08-29 17:30:16 +08:00
  • 6a7e6ee5c5 修复销售-表面工艺外协 jinling.yang 2024-08-29 17:24:09 +08:00
  • aff35f2dd4 Accept Merge Request #1268: (feature/修复外协采购 -> develop) 杨金灵 2024-08-29 15:25:11 +08:00
  • 8ead5655cf 修复外协采购 jinling.yang 2024-08-29 15:23:28 +08:00
  • d6b3a5a3f1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-29 14:26:34 +08:00
  • 19d8f6ae73 Merge branch 'feature/优化工单' into develop jinling.yang 2024-08-29 14:26:24 +08:00
  • ae8e304d7f Accept Merge Request #1267: (feature/优化工单 -> develop) 杨金灵 2024-08-29 14:25:52 +08:00
  • e154f5b763 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单 jinling.yang 2024-08-29 14:22:50 +08:00