Commit Graph

183 Commits

Author SHA1 Message Date
mgw
4f83c5f29a 优化警告问题 2023-11-27 21:30:45 +08:00
龚启豪
66bb55a823 Accept Merge Request #696: (feature/修改机床参数bug -> develop)
Merge Request: 修改coding代码扫描警告

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/696?initial=true
2023-11-27 17:30:01 +08:00
qihao.gong@jikimo.com
c78ea6fbe5 修改coding代码扫描警告 2023-11-27 17:08:11 +08:00
mgw
858c163cbe 库存调整货架货位为标签 2023-11-23 22:14:56 +08:00
mgw
d6dcb6bf55 优化现有代码问题 2023-11-22 09:54:31 +08:00
mgw
890b73e108 优化js代码过长的问题,优化未用到的变量 2023-11-21 14:18:01 +08:00
mgw
718b1f9edf 优化代码结构 2023-11-20 13:23:37 +08:00
qihao.gong@jikimo.com
2322758e50 wms路线规则动态选取 2023-11-15 16:21:40 +08:00
qihao.gong@jikimo.com
b2a9088354 修改路线规则 2023-11-03 15:48:42 +08:00
qihao.gong@jikimo.com
018b51e1e5 解决无法生成采购单的bug 2023-10-27 15:06:49 +08:00
yuxianghui
5ea6158e8d 库存模块日志警告信息处理 2023-08-29 17:28:20 +08:00
mgw
9b239dbcb2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程 2023-08-11 12:24:35 +08:00
mgw
68805fee4a char字段聚焦全选功能已完成 2023-08-11 12:22:59 +08:00
qihao.gong@jikimo.com
386b5eb11c 修改采购入库路线多规则条件选取 2023-08-09 09:58:51 +08:00
mgw
0e2973f01e 修改位置占用bug 2023-07-27 09:21:24 +08:00
mgw
bace7aa175 去掉自定义barcode,暂时取消同步功能刀具 2023-07-26 15:25:12 +08:00
mgw
5b6a563a87 更改库存模块库区相关字段 2023-07-14 14:43:06 +08:00
WEB许何哲\xuhez
412083e2aa 主题logo添加中文 2023-07-14 10:33:11 +08:00
WEB许何哲\xuhez
1c022711a1 注释测试字段 2023-07-14 09:11:57 +08:00
WEB许何哲\xuhez
0291ed9a56 Merge branch 'develop' into feature/修改看板样式
# Conflicts:
#	sf_warehouse/views/view.xml
2023-07-14 09:10:37 +08:00
WEB许何哲\xuhez
b48a835808 修改看板樣式 2023-07-13 17:31:54 +08:00
mgw
f9c63b69a1 库存模块逻辑修改已完成 2023-07-13 16:09:28 +08:00
WEB许何哲\xuhez
b6de9d5e64 Merge branch 'develop' into feature/修改看板样式
# Conflicts:
#	sf_warehouse/__manifest__.py
#	sf_warehouse/static/src/kanban_color_change.scss
#	sf_warehouse/views/view.xml
2023-07-11 16:05:53 +08:00
WEB许何哲\xuhez
a3760a7d9d 0711提交 2023-07-11 16:00:21 +08:00
mgw
acd37b6c8c 修改sf_warehouse模块目录结构 2023-07-11 15:48:11 +08:00
mgw
94ffec20db 增加js_class类对看板视图进行布局修改 2023-07-11 15:43:03 +08:00
mgw
20c6a67f34 优化货位状态,以及产品显隐逻辑 2023-07-06 15:03:35 +08:00
WEB许何哲\xuhez
c440afa435 Merge branch 'develop' into feature/修改看板样式
解决冲突

# Conflicts:
#	sf_warehouse/__manifest__.py
#	sf_warehouse/static/src/change.scss
2023-07-06 14:41:17 +08:00
WEB许何哲\xuhez
26319beaa4 样式修改 2023-07-06 14:22:34 +08:00
mgw
bc7f516d2d 在看板xml中增加判断逻辑选择不同的class属性值,以匹配对应的css颜色 2023-07-06 12:26:35 +08:00
mgw
3a653a9485 优化货位看板显示字段 2023-07-06 09:38:57 +08:00
mgw
b754534b5b 完善库存模块新增功能及编码规则,已实现据货架分别展示下属货位的看板,待优化 2023-07-05 23:02:22 +08:00
mgw
0d7c269c3b 继承原生库存模块,为位置模型增加库区库位等字段 2023-07-04 20:05:59 +08:00