胡尧
|
4615f1576f
|
解决采购申请创建的采购单取消后导致后续单据无法就绪的问题
|
2025-07-02 17:31:43 +08:00 |
|
胡尧
|
c8f1676de9
|
解决采购申请创建的采购单取消后导致调拨单不能就绪的问题
|
2025-07-01 17:55:07 +08:00 |
|
胡尧
|
f165bec662
|
待完工工单明细，控制时间为大于48小时，小于当前时间
|
2025-06-25 09:42:53 +08:00 |
|
胡尧
|
133eac4a5c
|
日计划量对工单id去重
|
2025-06-25 08:43:59 +08:00 |
|
胡尧
|
9922402b3b
|
修复明细接口bug
|
2025-06-24 15:56:33 +08:00 |
|
胡尧
|
0a79a4e336
|
修改未完成订单明细的判断逻辑
|
2025-06-24 15:50:45 +08:00 |
|
胡尧
|
00922e3674
|
修改工单状态对应名字
|
2025-06-24 15:35:19 +08:00 |
|
胡尧
|
2a330a4bd8
|
修改大屏获取订单详情接口
|
2025-06-24 14:52:03 +08:00 |
|
胡尧
|
33647fa3e0
|
修改明细接口
|
2025-06-24 14:18:27 +08:00 |
|
胡尧
|
a2a652eea4
|
解决大屏bug
|
2025-06-23 17:54:38 +08:00 |
|
胡尧
|
05c5c0ef81
|
修复时间显示问题
|
2025-06-23 09:22:37 +08:00 |
|
胡尧
|
35e80266d7
|
修改日产量时间
|
2025-06-23 08:59:02 +08:00 |
|
胡尧
|
13d33488dc
|
修改计划量字段为qty_production
|
2025-06-20 15:39:11 +08:00 |
|
胡尧
|
2c2fa87719
|
修改产量接口bug
|
2025-06-20 11:26:48 +08:00 |
|
胡尧
|
e7b312fb22
|
去掉多余代码
|
2025-06-20 10:53:31 +08:00 |
|
胡尧
|
55cc4906ef
|
修改大屏数据接口，日完成量统计,获取产线产量相关,获取工单明细
|
2025-06-19 15:02:55 +08:00 |
|
胡尧
|
d21e0c7fd9
|
修改大屏数据接口，支持线下数据
|
2025-06-19 10:54:33 +08:00 |
|
胡尧
|
61034c3424
|
调整数据获取逻辑
|
2025-06-16 17:33:55 +08:00 |
|
胡尧
|
10e995ec7f
|
修改获取产量相关接口
|
2025-06-16 16:25:01 +08:00 |
|
胡尧
|
5c7e6e969f
|
Accept Merge Request #2199: (feature/修改产品名称 -> develop)
Merge Request: 客供料的制造订单，不显示采购申请的智能按钮
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2199
|
2025-06-16 15:00:42 +08:00 |
|
胡尧
|
d70b757487
|
客供料的制造订单，不显示采购申请的智能按钮
|
2025-06-16 14:51:07 +08:00 |
|
管欢
|
fb3bb8f1c0
|
Accept Merge Request #2198: (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/2198
|
2025-06-16 14:44:40 +08:00 |
|
guanhuan
|
9123aeaee8
|
人工线下加工最后一个工单完工后未记录时间完工时间
|
2025-06-16 14:35:28 +08:00 |
|
胡尧
|
e3af0bea3c
|
Accept Merge Request #2197: (feature/修改产品名称 -> develop)
Merge Request: 在调拨单验证前，先进行设置数量
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2197?initial=true
|
2025-06-16 14:25:27 +08:00 |
|
胡尧
|
af1bc021d6
|
在调拨单验证前，先进行设置数量
|
2025-06-16 14:24:50 +08:00 |
|
guanhuan
|
2febc369bb
|
确认工艺路线新增表面工艺参数需要同步到产品的加工参数中
|
2025-06-16 13:44:55 +08:00 |
|
胡尧
|
6ee1c5f9a9
|
Accept Merge Request #2196: (feature/修改产品名称 -> develop)
Merge Request: 修改migrate脚本，解决更新慢的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2196?initial=true
|
2025-06-16 13:42:42 +08:00 |
|
胡尧
|
5ef8023169
|
修改migrate脚本，解决更新慢的问题
|
2025-06-16 13:41:50 +08:00 |
|
guanhuan
|
fa03b562a2
|
确认工艺路线新增表面工艺参数需要同步到产品的加工参数中
|
2025-06-16 11:52:22 +08:00 |
|
guanhuan
|
5f55c954d1
|
确认工艺路线新增表面工艺参数需要同步到产品的加工参数中
|
2025-06-16 11:42:21 +08:00 |
|
胡尧
|
e0ca13b5b7
|
Accept Merge Request #2195: (feature/修改产品名称 -> develop)
Merge Request: 修改产品名称
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2195?initial=true
|
2025-06-16 10:51:28 +08:00 |
|
胡尧
|
dba38f4d37
|
修改产品名称
|
2025-06-16 10:50:56 +08:00 |
|
胡尧
|
ceb7a02209
|
Accept Merge Request #2194: (feature/修改产品名称 -> develop)
Merge Request: 解决修改产品名称带来的影响
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2194?initial=true
|
2025-06-16 09:36:16 +08:00 |
|
胡尧
|
1811dbf0fd
|
解决修改产品名称带来的影响
|
2025-06-16 09:33:52 +08:00 |
|
胡尧
|
1c1d1a74ad
|
Accept Merge Request #2193: (feature/修改产品名称 -> develop)
Merge Request: 修改产品名称生成规则
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2193?initial=true
|
2025-06-16 09:21:06 +08:00 |
|
胡尧
|
347019d7ee
|
修改产品名称生成规则
|
2025-06-16 09:20:32 +08:00 |
|
管欢
|
7d46d00fd7
|
Accept Merge Request #2192: (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/2192
|
2025-06-16 08:53:35 +08:00 |
|
胡尧
|
5a22402e7a
|
Accept Merge Request #2191: (feature/修改产品名称 -> develop)
Merge Request: 修改接口授权后，没有赋予用户的bug，导致无法获取公司，增加替换sf销售订单行产品名称的模块
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2191?initial=true
|
2025-06-13 17:55:13 +08:00 |
|
胡尧
|
f53e34aeb4
|
修改接口授权后，没有赋予用户的bug，导致无法获取公司，增加替换sf销售订单行产品名称的模块
|
2025-06-13 17:53:57 +08:00 |
|
guanhuan
|
e145e8a3a4
|
下发时修改需求计划的总预计加工时间
|
2025-06-13 15:40:02 +08:00 |
|
管欢
|
0ef6fe73f3
|
Accept Merge Request #2190: (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/2190
|
2025-06-13 14:24:29 +08:00 |
|
guanhuan
|
ffad4b7995
|
修复坯料的采购申请按钮没显示
|
2025-06-13 14:17:48 +08:00 |
|
guanhuan
|
2c7fbd3aef
|
修复坯料的采购申请按钮没显示
|
2025-06-13 10:41:57 +08:00 |
|
禹翔辉
|
72b8d33a3e
|
Accept Merge Request #2189: (feature/功能刀具组装支持搜索更多物料 -> develop)
Merge Request: 功能刀具组装点【更多】按钮弹窗的物料添加【BOM物料】默认筛选，根据BOM筛选出符合条件的物料信息；取消默认筛选后记录按满足BOM的和不满足BOM的顺序排序出现。
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2189
|
2025-06-13 10:21:32 +08:00 |
|
yuxianghui
|
6517d2bd12
|
功能刀具组装点【更多】按钮弹窗的物料添加【BOM物料】默认筛选，根据BOM筛选出符合条件的物料信息；取消默认筛选后记录按满足BOM的和不满足BOM的顺序排序出现。
|
2025-06-13 10:19:11 +08:00 |
|
guanhuan
|
2c97287218
|
下达生产修改
|
2025-06-13 10:05:33 +08:00 |
|
胡尧
|
012ff120b4
|
Accept Merge Request #2188: (hotfix/修复刀具预警没有预警记录和通知 -> develop)
Merge Request: 功能刀具寿命到期消息通知
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2188
|
2025-06-13 08:41:05 +08:00 |
|
胡梓杨
|
960f05090c
|
Accept Merge Request #2187: (feature/6973 -> 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/2187
|
2025-06-12 15:48:03 +08:00 |
|
huziyang@jikimo.com
|
6321e7ef23
|
货位看板详情回退修复，删除幽灵卡片。
|
2025-06-12 15:38:56 +08:00 |
|
管欢
|
69d200973b
|
Accept Merge Request #2186: (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/2186
|
2025-06-12 10:57:11 +08:00 |
|
guanhuan
|
448a2cd277
|
需求计划对应产品的调拨单显示不正确
|
2025-06-12 10:54:07 +08:00 |
|
guanhuan
|
5a071188cc
|
需求计划对应产品的调拨单显示不正确
|
2025-06-12 10:53:46 +08:00 |
|
yuxianghui
|
b8894609a9
|
功能刀具寿命到期消息通知
|
2025-06-12 10:10:13 +08:00 |
|
yuxianghui
|
3f8fd6da62
|
创建刀具拆解单判断条件优化
|
2025-06-12 09:40:32 +08:00 |
|
guanhuan
|
154a17657c
|
需求计划材料销售订单行取值问题
|
2025-06-12 09:35:39 +08:00 |
|
yuxianghui
|
62ead52f00
|
处理功能刀具预警时没有创建功能刀具预警记录和功能刀具拆解单bug
|
2025-06-11 17:18:59 +08:00 |
|
管欢
|
23d6e38b24
|
Accept Merge Request #2185: (hotfix/备注为空 -> 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/2185
|
2025-06-11 16:02:38 +08:00 |
|
管欢
|
bdc23afc56
|
Accept Merge Request #2184: (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/2184
|
2025-06-11 13:51:01 +08:00 |
|
guanhuan
|
b8043b3ad2
|
修复多条采购申请跳转报错
|
2025-06-11 11:41:03 +08:00 |
|
胡尧
|
8841d800ea
|
Merge branch 'hotfix/备注为空' into release/release_2.14
|
2025-06-11 11:28:35 +08:00 |
|
guanhuan
|
920e96ffc6
|
修复备注为空
|
2025-06-11 11:19:31 +08:00 |
|
yuxianghui
|
d52f5fa841
|
修复取消订单时报错bug
|
2025-06-11 11:15:03 +08:00 |
|
guanhuan
|
37c5c9d498
|
需求计划列表拖动
|
2025-06-11 10:40:26 +08:00 |
|
guanhuan
|
6867d7e4ce
|
需求计划合同号
|
2025-06-11 09:48:53 +08:00 |
|
管欢
|
9cbd311fec
|
Accept Merge Request #2183: (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/2183
|
2025-06-11 09:22:25 +08:00 |
|
guanhuan
|
0e753b1c85
|
命名修改
|
2025-06-11 08:59:41 +08:00 |
|
guanhuan
|
48316c55b7
|
命名修改
|
2025-06-11 08:57:51 +08:00 |
|
guanhuan
|
b33ba9c354
|
命名修改
|
2025-06-11 08:56:44 +08:00 |
|
胡尧
|
e0559e9887
|
Merge branch 'develop' into release/release_2.14
|
2025-06-10 16:33:57 +08:00 |
|
管欢
|
39a25bb6c8
|
Accept Merge Request #2180: (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/2180
|
2025-06-10 16:33:37 +08:00 |
|
guanhuan
|
796e9b0cef
|
需求计划新增合同日期等字段
|
2025-06-10 15:49:22 +08:00 |
|
禹翔辉
|
e129c08426
|
Accept Merge Request #2179: (feature/bfm下单接口优化 -> 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/2179
|
2025-06-10 15:28:17 +08:00 |
|
yuxianghui
|
c6b47bd68d
|
销售订单新增合同日期字段
|
2025-06-10 15:26:32 +08:00 |
|
guanhuan
|
126d60f8d7
|
Merge branch 'refs/heads/feature/搜索优化' into release/release_2.14
|
2025-06-10 10:45:52 +08:00 |
|
guanhuan
|
4225a8fe1b
|
采购申请单完成操作提示调整
|
2025-06-10 10:45:06 +08:00 |
|
guanhuan
|
a13a79f41f
|
Merge branch 'refs/heads/feature/搜索优化' into release/release_2.14
|
2025-06-09 17:56:50 +08:00 |
|
guanhuan
|
a828c823dd
|
采购申请单完成操作修改
|
2025-06-09 17:55:34 +08:00 |
|
guanhuan
|
9cf2bac9c6
|
修复返工问题
|
2025-06-09 17:39:55 +08:00 |
|
guanhuan
|
1926375d58
|
需求计划文件打印
|
2025-06-09 10:30:12 +08:00 |
|
huziyang@jikimo.com
|
23dd88b7ba
|
解决冲突
|
2025-06-09 10:01:57 +08:00 |
|
huziyang@jikimo.com
|
f164488e48
|
屏蔽OCC导入
|
2025-06-09 09:59:47 +08:00 |
|
huziyang@jikimo.com
|
25b53794bb
|
处理#6973任务：
1货位编码规则简化
2货位看板直观化展示
|
2025-06-09 09:49:21 +08:00 |
|
胡尧
|
484fab85be
|
Accept Merge Request #2176: (feature/6694 -> develop)
Merge Request: 修改出厂检验报告预览数据
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2176
|
2025-06-09 09:09:06 +08:00 |
|
胡尧
|
6ed5de6400
|
修改出厂检验报告预览数据
|
2025-06-09 09:08:26 +08:00 |
|
guanhuan
|
8224f36567
|
需求计划页面显示
|
2025-06-06 15:24:12 +08:00 |
|
胡尧
|
2449b92bc8
|
Accept Merge Request #2175: (feature/6694 -> develop)
Merge Request: 修复点击智能按钮点击的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2175?initial=true
|
2025-06-06 09:34:15 +08:00 |
|
胡尧
|
03ec94d223
|
修复点击智能按钮点击的问题
|
2025-06-06 09:33:23 +08:00 |
|
胡尧
|
d26e6edd31
|
Accept Merge Request #2174: (feature/6694 -> develop)
Merge Request: 修改制造订单的采购申请只能按钮判断规则
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2174?initial=true
|
2025-06-06 09:17:06 +08:00 |
|
胡尧
|
2ea24f2049
|
修改制造订单的采购申请只能按钮判断规则
|
2025-06-06 09:16:41 +08:00 |
|
guanhuan
|
b11b6ef283
|
合同编号显示
|
2025-06-06 09:11:03 +08:00 |
|
胡尧
|
b1a04f8f44
|
Accept Merge Request #2173: (feature/6694 -> develop)
Merge Request: 在出厂检验报告验证数量时，增加产品的匹配
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2173?initial=true
|
2025-06-06 08:37:58 +08:00 |
|
胡尧
|
0b5415dc47
|
在出厂检验报告验证数量时，增加产品的匹配
|
2025-06-06 08:37:38 +08:00 |
|
胡尧
|
59569806e6
|
Accept Merge Request #2172: (feature/6694 -> develop)
Merge Request: 修复二次弹窗不能刷新页面的问题，但是js方法还需要修改
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2172
|
2025-06-06 08:29:51 +08:00 |
|
胡尧
|
4e1be6f4d5
|
修复二次弹窗不能刷新页面的问题，但是js方法还需要修改
|
2025-06-06 08:29:25 +08:00 |
|
禹翔辉
|
cdf8fbb12a
|
Accept Merge Request #2171: (feature/销售合同优化 -> develop)
Merge Request: 1、销售订单添加合同编号字段，bfm下单接口添加合同编号同步；2、优化解除装夹工单完工时解绑rfid逻辑，优化工单返工时新工单绑定rfid逻辑
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2171
|
2025-06-05 17:03:44 +08:00 |
|
yuxianghui
|
5d0f094da7
|
1
|
2025-06-05 17:03:06 +08:00 |
|
guanhuan
|
865d2216af
|
未齐套提示按钮修改
|
2025-06-05 17:02:39 +08:00 |
|
yuxianghui
|
95cb5251dc
|
1、销售订单添加合同编号字段，bfm下单接口添加合同编号同步；2、优化解除装夹工单完工时解绑rfid逻辑，优化工单返工时新工单绑定rfid逻辑
|
2025-06-05 16:59:33 +08:00 |
|
guanhuan
|
1d01e3ad2e
|
未齐套提示
|
2025-06-05 16:17:18 +08:00 |
|
禹翔辉
|
c8fe7504c7
|
Accept Merge Request #2170: (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/2170
|
2025-06-05 15:35:03 +08:00 |
|
yuxianghui
|
222efc57c2
|
返工优化
|
2025-06-05 15:29:14 +08:00 |
|
禹翔辉
|
735d5c659d
|
Accept Merge Request #2169: (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/2169
|
2025-06-05 14:53:53 +08:00 |
|
yuxianghui
|
50d188b737
|
处理自动化产线的确认工艺路线报错
|
2025-06-05 14:49:09 +08:00 |
|
禹翔辉
|
af3ea0f702
|
Accept Merge Request #2168: (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/2168
|
2025-06-05 13:59:35 +08:00 |
|
yuxianghui
|
8bf3b68cee
|
处理批量修改采购申请报错
|
2025-06-05 13:52:25 +08:00 |
|
禹翔辉
|
2766bc7d34
|
Accept Merge Request #2167: (feature/销售合同优化 -> develop)
Merge Request: 返工装夹预调工单时，清除同一个面工单的rfid，并且保留返工工单的rfid记录
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2167
|
2025-06-05 11:20:09 +08:00 |
|
yuxianghui
|
1082384d00
|
清除返工工单的rfid，并保留记录
|
2025-06-05 11:18:47 +08:00 |
|
yuxianghui
|
25aab1576d
|
返工装夹预调工单时，清除同一个面工单的rfid，并且保留返工工单的rfid记录
|
2025-06-05 11:11:54 +08:00 |
|
禹翔辉
|
87891b45ef
|
Accept Merge Request #2165: (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/2165
|
2025-06-05 10:23:23 +08:00 |
|
胡尧
|
b2cfdd8d78
|
Accept Merge Request #2166: (feature/6694 -> develop)
Merge Request: 修改质检单字段显示
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2166?initial=true
|
2025-06-05 10:21:11 +08:00 |
|
胡尧
|
540b7bcbea
|
修改质检单字段显示
|
2025-06-05 10:19:58 +08:00 |
|
yuxianghui
|
c6cb1d367d
|
处理返工报错
|
2025-06-05 10:17:39 +08:00 |
|
禹翔辉
|
001900bd65
|
Accept Merge Request #2164: (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/2164
|
2025-06-05 09:19:28 +08:00 |
|
yuxianghui
|
0204e0e24f
|
Merge branch 'feature/采购消息通知' into feature/销售合同优化
|
2025-06-05 09:17:26 +08:00 |
|
yuxianghui
|
2b3a2dd21c
|
1、处理返工报错，2、保存的合同文档添加对应销售订单号
|
2025-06-05 09:16:02 +08:00 |
|
胡尧
|
57acad4716
|
Accept Merge Request #2163: (feature/6694 -> develop)
Merge Request: 调整采购申请菜单位置
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2163?initial=true
|
2025-06-05 09:15:46 +08:00 |
|
胡尧
|
9f97c82a46
|
调整采购申请菜单位置
|
2025-06-05 09:15:25 +08:00 |
|
胡尧
|
7cafddd345
|
Accept Merge Request #2162: (feature/6694 -> develop)
Merge Request: 修改出厂检验报告重新发布按钮，增加确认提示
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2162?initial=true
|
2025-06-05 08:59:10 +08:00 |
|
胡尧
|
c796697a8e
|
修改出厂检验报告重新发布按钮，增加确认提示
|
2025-06-05 08:56:34 +08:00 |
|
胡尧
|
ee523e9aac
|
Accept Merge Request #2161: (feature/6694 -> develop)
Merge Request: 出厂检验报告发布按钮增加判断
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2161?initial=true
|
2025-06-04 17:36:24 +08:00 |
|
胡尧
|
87fdc7bf74
|
出厂检验报告发布按钮增加判断
|
2025-06-04 17:35:57 +08:00 |
|
guanhuan
|
fc41f30244
|
未齐套提示
|
2025-06-04 17:31:10 +08:00 |
|
guanhuan
|
fbcd8c57c5
|
未齐套提示
|
2025-06-04 16:38:46 +08:00 |
|
禹翔辉
|
e7d84e9df2
|
Accept Merge Request #2160: (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/2160
|
2025-06-04 16:28:15 +08:00 |
|
yuxianghui
|
b7642d1e0f
|
Merge branch 'feature/销售订单优化' into feature/采购消息通知
|
2025-06-04 16:26:03 +08:00 |
|
yuxianghui
|
05ffbdcc78
|
采购申请、待质检消息通知优化
|
2025-06-04 16:24:52 +08:00 |
|
胡尧
|
4b8d00ec1d
|
Accept Merge Request #2159: (feature/6694 -> develop)
Merge Request: 修复质检字段显示错误问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2159?initial=true
|
2025-06-04 16:06:16 +08:00 |
|
胡尧
|
d2dbf4f986
|
修复质检字段显示错误问题
|
2025-06-04 16:05:51 +08:00 |
|
guanhuan
|
b0f2fe6a8e
|
未齐套提示
|
2025-06-04 13:38:40 +08:00 |
|
禹翔辉
|
edfd59468f
|
Accept Merge Request #2158: (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/2158
|
2025-06-04 11:36:18 +08:00 |
|
yuxianghui
|
d7f04b61b5
|
Merge branch 'feature/消息通知优化' into feature/销售订单优化
|
2025-06-04 11:33:04 +08:00 |
|
yuxianghui
|
573b50da68
|
销售订单添加合同字段，销售订单form页面新增合同page页，优化/api/bfm_process_order/list接口添加合同信息处理。
|
2025-06-04 11:31:28 +08:00 |
|
胡尧
|
2e0dfc5b02
|
Accept Merge Request #2157: (feature/6694 -> develop)
Merge Request: 修改没有状态码时默认为200
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2157?initial=true
|
2025-06-04 09:17:01 +08:00 |
|
胡尧
|
18cdc39719
|
修改没有状态码时默认为200
|
2025-06-04 09:16:28 +08:00 |
|
guanhuan
|
de951b1b45
|
未齐套提示
|
2025-06-03 16:16:11 +08:00 |
|
guanhuan
|
b8cebe07fe
|
未齐套提示
|
2025-05-30 15:06:41 +08:00 |
|
胡尧
|
14fa88da01
|
Accept Merge Request #2156: (feature/6694 -> develop)
Merge Request: 修改编程返回记录申请人不对的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2156?initial=true
|
2025-05-30 10:27:10 +08:00 |
|
胡尧
|
162814411f
|
修改编程返回记录申请人不对的问题
|
2025-05-30 10:26:34 +08:00 |
|
guanhuan
|
1bdb81f5f7
|
待下达生产状态修改
|
2025-05-29 17:05:19 +08:00 |
|
胡尧
|
49e4c88d83
|
Accept Merge Request #2155: (feature/6694 -> develop)
Merge Request: 解决下发编程单报错的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2155?initial=true
|
2025-05-29 16:00:16 +08:00 |
|
胡尧
|
db81114a07
|
解决下发编程单报错的问题
|
2025-05-29 15:59:48 +08:00 |
|
禹翔辉
|
e019383187
|
Accept Merge Request #2154: (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/2154
|
2025-05-29 14:19:17 +08:00 |
|
yuxianghui
|
4a09148b53
|
质检消息通知优化
|
2025-05-29 14:10:36 +08:00 |
|