guanhuan
|
4225a8fe1b
|
采购申请单完成操作提示调整
|
2025-06-10 10:45:06 +08:00 |
|
guanhuan
|
a828c823dd
|
采购申请单完成操作修改
|
2025-06-09 17:55:34 +08:00 |
|
guanhuan
|
38109028d4
|
采购申请关闭修改
|
2025-05-23 15:13:01 +08:00 |
|
guanhuan
|
cf16a9dd59
|
采购申请关闭修改
|
2025-05-23 14:53:34 +08:00 |
|
guanhuan
|
1b0dd96b40
|
采购申请关闭修改
|
2025-05-23 14:20:48 +08:00 |
|
guanhuan
|
2c52372b0a
|
采购申请隐藏处理中按钮
|
2025-05-22 11:44:14 +08:00 |
|
guanhuan
|
8bd09cddf0
|
采购申请按钮优化
|
2025-05-19 11:02:43 +08:00 |
|
guanhuan
|
52579673de
|
采购申请单完成操作优化
|
2025-05-19 08:54:02 +08:00 |
|
胡尧
|
a29265f17d
|
修改正则匹配成品名字序号
|
2025-05-15 16:39:57 +08:00 |
|
胡尧
|
ac4883db66
|
解决采购申请中零件图号不匹配的问题
|
2025-05-15 16:29:33 +08:00 |
|
胡尧
|
c2e4085b50
|
解决产品模板复制的问题
|
2025-05-15 12:14:33 +08:00 |
|
胡尧
|
c898e02860
|
解决制造申请字段未复制到成品中
|
2025-05-14 17:02:04 +08:00 |
|
管欢
|
8249d1427f
|
Accept Merge Request #2105: (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/2105
|
2025-05-09 18:28:56 +08:00 |
|
guanhuan
|
94bcfc0543
|
采购申请数量修改过滤取消
|
2025-05-09 18:15:40 +08:00 |
|
guanhuan
|
b4d31c7c4b
|
采购申请数量修改
|
2025-05-09 17:50:43 +08:00 |
|
胡尧
|
dd5794899d
|
Accept Merge Request #2100: (feature/6694 -> develop)
Merge Request: 人工线下返工在不选择重新编程时复制加工图纸
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2100?initial=true
|
2025-05-08 21:22:21 +08:00 |
|
胡尧
|
e5b730b2ef
|
人工线下返工在不选择重新编程时复制加工图纸
|
2025-05-08 21:21:51 +08:00 |
|
胡尧
|
a933a0ffea
|
Accept Merge Request #2099: (feature/6694 -> develop)
Merge Request: 委外加工的入库单增加采购申请按钮
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2099?initial=true
|
2025-05-08 20:13:20 +08:00 |
|
胡尧
|
7575424760
|
委外加工的入库单增加采购申请按钮
|
2025-05-08 20:12:12 +08:00 |
|
胡尧
|
6c2eb40e6a
|
Accept Merge Request #2098: (feature/6694 -> develop)
Merge Request: 解决制造订单不显示采购申请按钮的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2098?initial=true
|
2025-05-08 17:48:05 +08:00 |
|
胡尧
|
f10f595fa4
|
解决制造订单不显示采购申请按钮的问题
|
2025-05-08 17:47:40 +08:00 |
|
胡尧
|
6d1de42d76
|
Accept Merge Request #2097: (feature/6694 -> develop)
Merge Request: 修复收料入库单明细不对的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2097?initial=true
|
2025-05-08 17:30:19 +08:00 |
|
胡尧
|
5dc16c039c
|
修复收料入库单明细不对的问题
|
2025-05-08 17:29:41 +08:00 |
|
胡尧
|
c416cdbeed
|
Accept Merge Request #2096: (feature/6694 -> develop)
Merge Request: 取消采购申请合并明细行的代码，会导致其他后续单据的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2096?initial=true
|
2025-05-08 16:47:22 +08:00 |
|
胡尧
|
18c7b22319
|
取消采购申请合并明细行的代码，会导致其他后续单据的问题
|
2025-05-08 16:47:01 +08:00 |
|
管欢
|
9349ca91d3
|
Accept Merge Request #2093: (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/2093
|
2025-05-08 09:18:28 +08:00 |
|
guanhuan
|
95716c2e3e
|
采购申请明细优化
|
2025-05-07 16:44:48 +08:00 |
|
胡尧
|
c24bba3137
|
增加采购申请对于单件制造非首个制造订单的显示，修改采购申请对于同一个补货组同一个产品的合并
|
2025-05-07 16:34:45 +08:00 |
|
guanhuan
|
bf4add6b78
|
采购申请明细优化
|
2025-05-07 16:02:39 +08:00 |
|
guanhuan
|
21d052e222
|
采购申请明细优化
|
2025-04-29 10:40:19 +08:00 |
|
胡尧
|
644ff967e5
|
解决pdf上数字乱码的问题
|
2025-04-27 14:10:29 +08:00 |
|
liaodanlong
|
9f1beb4013
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/purchase_order.py
# sf_sale/models/sale_order.py
|
2025-04-27 08:50:45 +08:00 |
|
liaodanlong
|
9cf70cc54c
|
工艺外协代码回退
|
2025-04-26 14:42:38 +08:00 |
|
liaodanlong
|
443a21a0cc
|
工序外协需求
|
2025-04-25 11:46:05 +08:00 |
|
胡尧
|
6767b693f5
|
取消线上解决bug的改动
|
2025-04-23 14:22:50 +08:00 |
|
胡尧
|
7b77d846c3
|
Accept Merge Request #2040: (hotfix/解决采购申请bug -> develop)
Merge Request: 解决创建采购申请报错
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2040?initial=true
|
2025-04-23 14:21:27 +08:00 |
|
胡尧
|
05b5e9cfd9
|
解决创建采购申请报错
|
2025-04-23 10:32:39 +08:00 |
|
胡尧
|
86dfd437cc
|
解决创建采购申请报错
|
2025-04-23 10:31:30 +08:00 |
|
胡尧
|
3a92e4cfd8
|
解决创建采购申请报错
|
2025-04-23 10:22:20 +08:00 |
|
liaodanlong
|
dc6fb4ddda
|
采购申请单查询条件同一
|
2025-04-23 09:34:02 +08:00 |
|
liaodanlong
|
9f9c08b1f0
|
制造订单采购申请查询问题
|
2025-04-21 14:35:57 +08:00 |
|
胡尧
|
651918c51c
|
Merge branch 'develop' into feature/commercially_launched
|
2025-04-01 20:42:36 +08:00 |
|
胡尧
|
7b13dfcc0e
|
Accept Merge Request #1982: (feature/tool_standard_library_process -> 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/1982
|
2025-04-01 20:32:39 +08:00 |
|
liaodanlong
|
60e139d5e0
|
采购申请添加字段的翻译
|
2025-04-01 16:59:40 +08:00 |
|
胡尧
|
8d5ea0ae19
|
去掉采购申请不同补货组不能合并的检查
|
2025-04-01 11:07:08 +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 |
|
yuxianghui
|
e7cb100ab1
|
1、优化调拨单验证方法；2、隐藏请购明细列表视图字段
|
2025-03-31 15:55:37 +08:00 |
|
胡尧
|
4ca655ad51
|
采购申请跳转到采购单，不默认筛选询价单
|
2025-03-25 17:09:22 +08:00 |
|
mgw
|
3e9a11dd7b
|
调整样式
|
2025-03-25 15:02:26 +08:00 |
|