jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,266 Commits 134 Branches 31 Tags
fffe0a230ba230a0e49f704b8f8b6f0fb9c69f5c
Commit Graph

123 Commits

Author SHA1 Message Date
mgw
869e3e4b4f 修复”制造订单完工后对应的成品入库单还是等待状态-应该是就绪状态“ 2024-07-04 16:12:27 +08:00
mgw
d7d5ccc142 优化订单状态条件及物流的容错处理 2024-07-01 17:27:52 +08:00
mgw
ee1629b40a 优化物流提示 2024-07-01 11:47:51 +08:00
mgw
7fd3647afb sf物流优化 2024-06-26 16:34:04 +08:00
jinling.yang
88ef9c106d 修复编程单下发ftp路径 2024-06-25 17:54:08 +08:00
mgw
f67d08fc88 工件装夹预调工单页面优化需求-1 2024-06-24 15:00:54 +08:00
mgw
4459ed2e81 库存处增加批量调拨功能 2024-06-06 15:44:20 +08:00
mgw
fe6bb46d54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-05-17 11:47:44 +08:00
mgw
432a012596 显示优化，物流下单增补逻辑 2024-05-17 11:47:26 +08:00
jinling.yang
7e31869d1f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复 
# Conflicts:
#	sf_sale/views/sale_order_view.xml
 2024-05-17 11:00:58 +08:00
mgw
d244409d9c 处理物流处修改销售订单状态问题 2024-05-15 14:09:44 +08:00
jinling.yang
934b59d213 坯料新增路线 2024-05-14 10:51:38 +08:00
mgw
1afc48a20e 去掉销售订单加工状态 2024-05-11 23:36:18 +08:00
jinling.yang
2bffc5964a 1.1修复排程工件配送没有目的生产线2.注释获取cnc程序最新代码（第二期）3.优化部分页面 2024-05-11 00:17:43 +08:00
jinling.yang
d5a1a82c72 1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示 
2.修复质量标准去掉审核按钮显示
 2024-03-15 16:59:51 +08:00
jinling.yang
0bc055b1a7 优化加工订单接口日志 2024-02-29 11:09:20 +08:00
mgw
391dedc7b1 产品加工进度反馈给销售订单 2024-02-27 15:47:16 +08:00
jinling.yang
7bf2316c09 优化接口和工单 2024-02-22 19:40:25 +08:00
jinling.yang
5916b4a740 修复日计划工单接口和http 2024-02-22 18:52:36 +08:00
jinling.yang
da97fce6d5 新增agv相关接口 2024-02-22 17:16:16 +08:00
jinling.yang
0d755a50ae 优化工单相关接口 2024-02-22 14:26:56 +08:00
jinling.yang
0354f6b136 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化快速订单 2024-02-21 14:52:36 +08:00
jinling.yang
1e006b0bd7 1.工单新增rfid字段 
2.修改中控对接的工单接口
3.快速订单材料，型号，客户修改为可选择
 2024-02-21 14:52:14 +08:00
mgw
72df0aa640 修复物流方式导致的分配工厂失败问题 2024-02-21 11:32:06 +08:00
mgw
635583826f 物流处bug修复 2024-02-19 17:23:57 +08:00
jinling.yang
1ca5817379 客户页面优化编辑 2024-02-04 14:22:53 +08:00
mgw
1af08763ea 调整视图显隐控制逻辑 2024-01-24 14:24:01 +08:00
mgw
5c129331e0 增加功能：当为非“自提”单时，必须进行物流下单才能进行出库操作。增加对字段的显隐控制 2024-01-23 16:13:53 +08:00
mgw
90f8c4143e 物流相关增量开发，修改一些原生按钮，修改一些翻译 2024-01-23 10:34:49 +08:00
mgw
facdf5712a 修改京东物流寻单据部分逻辑 2023-12-11 14:45:55 +08:00
mgw
1ccc32cbcb 优化物流、计划权限及库存的一些问题 2023-12-07 10:11:59 +08:00
马广威
c323d9995e Accept Merge Request #697: (feature/制造代码优化 -> develop) 
Merge Request: 物流可见性控制，优化警告问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/697?initial=true
 2023-11-27 21:33:35 +08:00
mgw
4f83c5f29a 优化警告问题 2023-11-27 21:30:45 +08:00
mgw
96df8f971c 物流相关可见性控制 2023-11-27 15:40:16 +08:00
马广威
35511effae Accept Merge Request #695: (feature/制造代码优化 -> develop) 
Merge Request: 优化物流下单等代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/695
 2023-11-27 12:18:47 +08:00
mgw
54912f15b9 优化物流下单等代码 2023-11-27 12:17:57 +08:00
马广威
e8a13f1721 Accept Merge Request #694: (feature/制造代码优化 -> develop) 
Merge Request: 优化代码，修改库存货架货位为标签

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/694?initial=true
 2023-11-24 21:46:16 +08:00
jinling.yang
5737d7b0bc 优化代码格式 2023-11-24 10:27:21 +08:00
mgw
5fd0beab95 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-11-23 22:23:21 +08:00
mgw
fee3572f38 错误问题处理 2023-11-23 22:14:12 +08:00
jinling.yang
61da25a031 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2023-11-23 17:39:35 +08:00
jinling.yang
e9be2e9c43 优化代码格式 2023-11-23 17:38:30 +08:00
qihao.gong@jikimo.com
b73a449b01 修改代码不规范问题 2023-11-23 17:37:06 +08:00
马广威
a36c30b5c1 Accept Merge Request #685: (feature/制造代码优化 -> develop) 
Merge Request: 修改机床链接模块，优化规范代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/685?initial=true
 2023-11-22 14:24:35 +08:00
mgw
cc58425f50 规范问题优化 2023-11-22 10:29:04 +08:00
马广威
dda3aad95d Accept Merge Request #684: (feature/制造代码优化 -> develop) 
Merge Request: 优化现有代码问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/684?initial=true
 2023-11-22 09:58:21 +08:00
mgw
d6dcb6bf55 优化现有代码问题 2023-11-22 09:54:31 +08:00
jinling.yang
6738f38131 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增销售权限 
# Conflicts:
#	sf_bf_connect/models/process_status.py
 2023-11-21 16:11:24 +08:00
jinling.yang
6ec6094c5e 1.新增销售和计划权限组2.优化代码格式 2023-11-21 16:10:05 +08:00
mgw
7391b1324d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-11-20 17:41:51 +08:00