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

Commit Graph

  • 1c34f2f15c Merge branch 'release/release_2.10' 胡尧 2025-04-02 09:08:47 +08:00
  • 80f259651c Accept Merge Request #1986: (feature/前端样式修改 -> develop) feature/mrp_bug_fixed 黄焱 2025-04-02 09:05:31 +08:00
  • 1c57ee0be1 修复没加引号字段 hyyy 2025-04-02 09:04:38 +08:00
  • c732bbad62 Accept Merge Request #1984: (feature/前端样式修改 -> develop) 黄焱 2025-04-02 08:54:03 +08:00
  • 5285fcd066 Accept Merge Request #1985: (feature/制造功能优化 -> develop) 马广威 2025-04-02 08:50:06 +08:00
  • d318d8cb32 零件名称调为可写 mgw 2025-04-02 08:49:24 +08:00
  • 5b9dc05653 还原代码 hyyy 2025-04-02 08:48:27 +08:00
  • a513592b21 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 hyyy 2025-04-02 08:36:23 +08:00
  • e686ea9469 Accept Merge Request #1983: (feature/commercially_launched -> develop) 胡尧 2025-04-01 20:45:15 +08:00
  • fd5ff0904e Merge branch 'release/release_2.10' 胡尧 2025-04-01 20:43:29 +08:00
  • 651918c51c Merge branch 'develop' into feature/commercially_launched feature/commercially_launched 胡尧 2025-04-01 20:42:36 +08:00
  • 7b13dfcc0e Accept Merge Request #1982: (feature/tool_standard_library_process -> develop) 胡尧 2025-04-01 20:32:39 +08:00
  • 60e139d5e0 采购申请添加字段的翻译 liaodanlong 2025-04-01 16:59:40 +08:00
  • 8d5ea0ae19 去掉采购申请不同补货组不能合并的检查 胡尧 2025-04-01 11:07:08 +08:00
  • d7597359ba 处理多个表面工艺，确认供货路线报错的问题 胡尧 2025-03-31 16:50:50 +08:00
  • f8309bfaba Merge branch 'develop' into feature/commercially_launched 胡尧 2025-03-31 16:07:11 +08:00
  • 7ed756f922 修改报错翻译 胡尧 2025-03-31 16:06:50 +08:00
  • e837b84a50 Accept Merge Request #1981: (feature/调拨验证方法优化 -> develop) 禹翔辉 2025-03-31 15:57:51 +08:00
  • e7cb100ab1 1、优化调拨单验证方法；2、隐藏请购明细列表视图字段 yuxianghui 2025-03-31 15:55:37 +08:00
  • d00c9dd38c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-31 13:02:30 +08:00
  • 1d857be16a 修改获取编程文件根目录 胡尧 2025-03-31 09:28:30 +08:00
  • 5914e4ca6e Accept Merge Request #1980: (feature/制造功能优化 -> develop) 马广威 2025-03-31 09:12:35 +08:00
  • d96970fb96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-31 09:11:44 +08:00
  • 0af9064fce 调整字段显隐 mgw 2025-03-31 09:11:21 +08:00
  • 21148ae74b 屏蔽sf获取编程文件的逻辑 胡尧 2025-03-31 09:06:36 +08:00
  • 1a3590b6b6 屏蔽物流下单的按钮 胡尧 2025-03-30 15:03:18 +08:00
  • b55c6c1fe7 修改前置三元检测文件根目录 胡尧 2025-03-30 11:16:40 +08:00
  • 8c61dcac29 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-28 14:25:58 +08:00
  • 41d4e9785f Accept Merge Request #1979: (feature/制造功能优化 -> develop) 马广威 2025-03-28 14:24:14 +08:00
  • 5bf86930e9 调整页脚布局 mgw 2025-03-28 14:23:41 +08:00
  • 7ad9885377 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-28 14:05:29 +08:00
  • 71433c18b7 Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-28 14:03:21 +08:00
  • 4b60ad307b Accept Merge Request #1978: (feature/制造功能优化 -> develop) 马广威 2025-03-28 14:02:11 +08:00
  • 1a5c8e5f56 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-28 14:01:17 +08:00
  • 8b1e12eb9f 质检报告优化 mgw 2025-03-28 14:00:55 +08:00
  • dbf2257a88 Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 胡尧 2025-03-28 13:37:37 +08:00
  • f34c01d1b0 解决表面工艺外协调拨单验证报错的问题 胡尧 2025-03-28 13:37:29 +08:00
  • 9c73062593 Accept Merge Request #1977: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-28 10:10:56 +08:00
  • 878fef18df 产品加工面部代码还原 liaodanlong 2025-03-28 10:03:41 +08:00
  • 8348c4fc48 Merge branch 'refs/heads/develop' into feature/commercially_launched liaodanlong 2025-03-27 16:42:22 +08:00
  • 8643fb2385 Accept Merge Request #1976: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-27 16:41:19 +08:00
  • 77744e75d7 子制造订单零件图号零件名称问题 liaodanlong 2025-03-27 16:38:57 +08:00
  • 4cbcf08da8 销售单默认筛选供货方式待确认 胡尧 2025-03-27 16:10:07 +08:00
  • af2a589679 添加翻译文件 mgw 2025-03-27 15:59:39 +08:00
  • 4b6f04aa9d 修改字段显示位置 胡尧 2025-03-27 15:51:16 +08:00
  • 4634d43012 Accept Merge Request #1975: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-27 15:23:00 +08:00
  • dd6e8b6707 调试信息 liaodanlong 2025-03-27 15:21:15 +08:00
  • 55337815c7 修改dashboard当日完成数据计算逻辑 mgw 2025-03-27 10:42:20 +08:00
  • 0ccb7cb3d1 Accept Merge Request #1974: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-26 17:24:40 +08:00
  • d2155b17b4 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process liaodanlong 2025-03-26 17:01:13 +08:00
  • 11a5217430 子制造订单零件图号与零件名称获取方式修改 liaodanlong 2025-03-26 16:57:47 +08:00
  • 855e0eb1c2 Accept Merge Request #1973: (feature/零件图号筛选 -> develop) 管欢 2025-03-26 14:50:07 +08:00
  • 6a70f3b88a 坯料冗余新增描述字段 feature/零件图号筛选 guanhuan 2025-03-26 14:32:53 +08:00
  • 236158d556 调拨单零件图号信息搜索 guanhuan 2025-03-26 13:35:28 +08:00
  • 1a67c5d1e3 Accept Merge Request #1971: (feature/mrp_bug_fixed -> develop) 胡尧 2025-03-26 09:10:19 +08:00
  • bdb8763fea 采购申请审批完成后状态变更 胡尧 2025-03-26 09:07:01 +08:00
  • 78ed512699 Accept Merge Request #1970: (feature/mrp_bug_fixed -> develop) 胡尧 2025-03-26 08:44:19 +08:00
  • 2e74c76e07 解决供货路线选择报错，采购申请审批状态编程已审批 胡尧 2025-03-26 08:43:18 +08:00
  • 40dcd11da8 解决供货路线选择报错 胡尧 2025-03-26 08:42:08 +08:00
  • f9b40be428 Accept Merge Request #1969: (feature/mrp_bug_fixed -> develop) 胡尧 2025-03-25 17:10:17 +08:00
  • 4ca655ad51 采购申请跳转到采购单，不默认筛选询价单 胡尧 2025-03-25 17:09:22 +08:00
  • a2ed102895 Accept Merge Request #1968: (feature/mrp_bug_fixed -> develop) 胡尧 2025-03-25 16:27:55 +08:00
  • 8ec746858c 询价单行项目价格判断 胡尧 2025-03-25 16:25:05 +08:00
  • 03539c7ed3 询价单行项目价格判断 胡尧 2025-03-25 16:20:54 +08:00
  • 4d38a11c3c 修改询价单判断行项目价格不能为0 胡尧 2025-03-25 15:58:24 +08:00
  • 6312bb988a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-25 15:04:15 +08:00
  • 2b082a0dd7 Accept Merge Request #1967: (feature/制造功能优化 -> develop) 马广威 2025-03-25 15:03:12 +08:00
  • 3e9a11dd7b 调整样式 mgw 2025-03-25 15:02:26 +08:00
  • f011c1efda 调整报告样式 mgw 2025-03-25 15:00:18 +08:00
  • fe9548a0d1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-25 14:08:06 +08:00
  • ac2d81285e Accept Merge Request #1966: (feature/制造功能优化 -> develop) 马广威 2025-03-25 14:06:49 +08:00
  • 73ae2cd5c3 补充下载链接 mgw 2025-03-25 14:06:23 +08:00
  • 0347eb48e4 销售订单行增加交期字段，销售订单列表默认值修改为供货方式待确认 胡尧 2025-03-25 13:48:17 +08:00
  • 0aae15cbce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-25 13:32:55 +08:00
  • d888be06c4 Accept Merge Request #1965: (feature/制造单页面优化 -> develop) 禹翔辉 2025-03-25 13:29:48 +08:00
  • 2275f7a384 制造订单详情页添加对应采购申请跳转链接 yuxianghui 2025-03-25 13:28:31 +08:00
  • 5a7d70fb6b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-25 13:27:51 +08:00
  • 1256f5ecb5 Accept Merge Request #1964: (feature/制造功能优化 -> develop) 马广威 2025-03-25 13:26:49 +08:00
  • 4dfac9e96f 修改报告二维码指向 mgw 2025-03-25 13:26:12 +08:00
  • 8ea8bf1f48 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-25 10:40:48 +08:00
  • 29f143a547 Accept Merge Request #1963: (feature/制造功能优化 -> develop) 马广威 2025-03-25 10:39:48 +08:00
  • 2eaf8aef8f 恢复旧报告名称字段 mgw 2025-03-25 10:39:24 +08:00
  • df78019226 Merge remote-tracking branch 'origin/feature/commercially_launched' into feature/commercially_launched liaodanlong 2025-03-25 10:39:22 +08:00
  • 6ad945b720 产品加工面板空值处理 liaodanlong 2025-03-25 10:39:02 +08:00
  • 3285d4da57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched mgw 2025-03-25 10:35:00 +08:00
  • 8d1466485a Accept Merge Request #1962: (feature/制造功能优化 -> develop) 马广威 2025-03-25 10:33:14 +08:00
  • b39281d057 调整报告编号 mgw 2025-03-25 10:32:12 +08:00
  • 60539462a0 报错处理 liaodanlong 2025-03-25 10:02:39 +08:00
  • fd9018a4c8 调整完成逻辑取值 mgw 2025-03-25 09:56:40 +08:00
  • 81b425ae0c 调拨单零件图号零件名称处理 liaodanlong 2025-03-24 17:28:16 +08:00
  • f8e8615dc8 适配索引 mgw 2025-03-24 17:25:23 +08:00
  • 2b2da79e33 调整筛选逻辑 mgw 2025-03-24 17:18:19 +08:00
  • 01ac8a19b6 Accept Merge Request #1961: (feature/制造功能优化 -> develop) 马广威 2025-03-24 16:51:02 +08:00
  • 20a8ca6146 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-03-24 16:50:20 +08:00
  • 62cd60ec06 优化数采查询代码 mgw 2025-03-24 16:49:49 +08:00
  • 33fabc068a 报错处理 liaodanlong 2025-03-24 16:06:11 +08:00
  • db4dd33709 报错处理 liaodanlong 2025-03-24 15:54:59 +08:00
  • 4acb0fa0ba Merge branch 'refs/heads/develop' into feature/commercially_launched liaodanlong 2025-03-24 15:39:26 +08:00
  • c9ba3a07bf Accept Merge Request #1960: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-03-24 15:38:07 +08:00
  • 89a2260adc 日志修改 liaodanlong 2025-03-24 15:16:55 +08:00