jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,240 Commits 134 Branches 31 Tags
03c317542a6d80cd9d516bee85680f1ce12aa854
Commit Graph

5240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
03c317542a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-15 13:36:34 +08:00
mgw
ece136e71e 解除屏蔽 2025-01-15 13:36:05 +08:00
马广威
e0452283f6 Accept Merge Request #1765: (feature/制造功能优化 -> develop) 
Merge Request: 调整扫码widget

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1765?initial=true
 2025-01-15 11:35:00 +08:00
禹翔辉
8ee98c52e4 Accept Merge Request #1764: (feature/工单-制造订单优化 -> develop) 
Merge Request: Merge branch 'feature/质检单优化' into feature/工单-制造订单优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1764?initial=true
 2025-01-15 11:27:55 +08:00
yuxianghui
1b9dbffcce Merge branch 'feature/质检单优化' into feature/工单-制造订单优化 2025-01-15 11:26:01 +08:00
yuxianghui
8d5d19ec69 1、质检单通过、失败按钮添加工单为返工时隐藏条件；2、处理夹具入库到夹具房时，夹具查询中夹具可用状态没有变更为可用问题；3、处理后置三元检测选择返工后制造订单状态没有变更为返工的问题 2025-01-15 11:25:00 +08:00
mgw
8bda70be71 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-15 10:19:42 +08:00
mgw
ca3015600a 调整扫码widget 2025-01-15 10:18:25 +08:00
马广威
09bd06774d Accept Merge Request #1763: (feature/制造功能优化 -> develop) 
Merge Request: 调整下发更新进行中状态的制造订单

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1763?initial=true
 2025-01-15 09:38:05 +08:00
mgw
eabe2aa9e9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-15 09:37:20 +08:00
mgw
4b6fd72237 调整下发更新进行中状态的制造订单 2025-01-15 09:34:09 +08:00
胡尧
f79fa75a68 Accept Merge Request #1762: (feature/customer_supply -> 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/1762#mr-1762-review-218183
 2025-01-15 08:43:31 +08:00
liaodanlong
f4f87555a8 排除坯料制造订单 2025-01-15 01:44:48 +08:00
liaodanlong
adbf5a6a0d 隐藏欠单 2025-01-14 21:03:27 +08:00
禹翔辉
19ff7b5eb4 Accept Merge Request #1761: (feature/质检单优化 -> develop) 
Merge Request: Merge branch 'feature/工单-质检优化_3' into feature/质检单优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1761
 2025-01-14 16:24:35 +08:00
yuxianghui
bf3256c4bc Merge branch 'feature/工单-质检优化_3' into feature/质检单优化 2025-01-14 16:22:59 +08:00
yuxianghui
847b7da8f7 处理 质检单确认合格或者不合格时报错 bug 2025-01-14 16:22:17 +08:00
马广威
61e08f20c7 Accept Merge Request #1760: (feature/制造功能优化 -> develop) 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1760?initial=true
 2025-01-14 16:22:08 +08:00
mgw
fc29791f1b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-14 16:21:35 +08:00
mgw
2a9d19436a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-14 16:21:07 +08:00
黄焱
e5762f7058 Accept Merge Request #1759: (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/1759?initial=true
 2025-01-14 16:20:52 +08:00
hyyy
357bb15e72 修复-会计-供应商-发票账单新增明细行标题显示错位了 2025-01-14 16:18:34 +08:00
马广威
7de2e98464 Accept Merge Request #1758: (feature/制造功能优化 -> develop) 
Merge Request: 直接使用recordset

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1758?initial=true
 2025-01-14 16:04:22 +08:00
mgw
78a9c59cde 直接使用recordset 2025-01-14 16:03:28 +08:00
马广威
18365de57e Accept Merge Request #1757: (feature/制造功能优化 -> develop) 
Merge Request: 调整取值对象

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1757?initial=true
 2025-01-14 15:54:26 +08:00
mgw
90644a705b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-14 15:53:35 +08:00
mgw
5106067882 调整取值对象 2025-01-14 15:52:09 +08:00
胡尧
79bd5344ad Accept Merge Request #1756: (feature/增加质检模块 -> develop) 
Merge Request: 解决收藏报错的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1756?initial=true
 2025-01-14 15:50:21 +08:00
胡尧
833b7ff78b Accept Merge Request #1755: (feature/customer_supply -> 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/1755
 2025-01-14 15:49:59 +08:00
胡尧
b9d95c0751 解决收藏报错的问题 2025-01-14 15:48:49 +08:00
liaodanlong
e5f15661ce 采购单重复产品限制去除 2025-01-14 15:10:22 +08:00
禹翔辉
33ee5cb172 Accept Merge Request #1754: (feature/工单-质检优化_3 -> develop) 
Merge Request: Merge branch 'feature/工单-质检优化_2' into feature/工单-质检优化_3

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1754
 2025-01-14 15:09:58 +08:00
yuxianghui
b433c6423b Merge branch 'feature/工单-质检优化_2' into feature/工单-质检优化_3 2025-01-14 15:08:42 +08:00
yuxianghui
eae310ddad 1、工单、质检单优化 2025-01-14 15:07:53 +08:00
廖丹龙
deff14b4d3 Accept Merge Request #1753: (feature/customer_supply -> 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/1753
 2025-01-14 14:17:26 +08:00
liaodanlong
9d6baee082 客供料与非客供料分开合并 2025-01-14 14:12:08 +08:00
管欢
47c54107f1 Accept Merge Request #1752: (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/1752
 2025-01-14 13:53:17 +08:00
马广威
551e6e0a02 Accept Merge Request #1751: (feature/制造功能优化 -> develop) 
Merge Request: 调整提示词

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1751?initial=true
 2025-01-14 13:29:08 +08:00
mgw
f992d625bb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-14 13:28:33 +08:00
mgw
883d6938e5 调整提示词 2025-01-14 13:28:08 +08:00
胡尧
37a5e37ed4 Accept Merge Request #1750: (feature/增加质检模块 -> develop) 
Merge Request: 修改模块翻译

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1750?initial=true
 2025-01-14 13:26:48 +08:00
胡尧
4aa6b59204 修改模块翻译 2025-01-14 13:25:52 +08:00
guanhuan
437b081f15 加工面筛选修改 2025-01-14 13:13:50 +08:00
马广威
489ecc8028 Accept Merge Request #1749: (feature/制造功能优化 -> develop) 
Merge Request: 调整编程记录生成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1749?initial=true
 2025-01-14 11:13:10 +08:00
mgw
bb5126d4f5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-01-14 11:12:41 +08:00
mgw
40603fea6a 调整编程记录生成 2025-01-14 11:12:07 +08:00
禹翔辉
0a718b9836 Accept Merge Request #1748: (feature/工单-质检优化_2 -> develop) 
Merge Request: Merge branch 'feature/工单-质检优化_1' into feature/工单-质检优化_2

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1748?initial=true
 2025-01-14 10:42:36 +08:00
yuxianghui
f44dff2106 Merge branch 'feature/工单-质检优化_1' into feature/工单-质检优化_2 2025-01-14 10:40:56 +08:00
yuxianghui
07d854a740 处理质检结果为返工时，制造订单状态没有更改为返工的问题 2025-01-14 09:25:06 +08:00
马广威
fa80d42fc0 Accept Merge Request #1747: (feature/制造功能优化 -> develop) 
Merge Request: 调整判断条件

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1747?initial=true
 2025-01-14 08:48:14 +08:00