胡尧
|
54abb7a9f7
|
增加备注
|
2024-10-16 10:22:30 +08:00 |
|
胡尧
|
e2bd36ca16
|
工单异常处理
|
2024-10-14 15:18:27 +08:00 |
|
hujiaying
|
441cfaffce
|
优化代码
|
2024-10-09 16:01:27 +08:00 |
|
liaodanlong
|
79ec3f2c91
|
r角默认值
|
2024-09-27 09:09:48 +08:00 |
|
liaodanlong
|
5b4376b5f9
|
r角默认值
|
2024-09-26 17:58:04 +08:00 |
|
hy
|
64e2b71a34
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
|
2024-09-24 11:15:10 +08:00 |
|
hy
|
d6fdeafef6
|
制造-刀具标准库界面样式显示有问题
|
2024-09-24 11:14:08 +08:00 |
|
胡尧
|
5024a9254d
|
删除皮肤文件
|
2024-09-23 16:08:49 +08:00 |
|
yuxianghui
|
4cee5213bb
|
产品字段值优化
|
2024-09-23 10:48:48 +08:00 |
|
yuxianghui
|
4558fc0336
|
Merge branch 'feature/库存优化' into feature/刀具优化
|
2024-09-20 16:51:39 +08:00 |
|
yuxianghui
|
4609ec442a
|
1、刀具标准库优化，整体式刀具物料产品优化；刀具同步接口优化；2、新增组装单扫描确认组装和获取测量值功能；组装单更换物料弹窗信息优化；
|
2024-09-20 16:50:55 +08:00 |
|
liaodanlong
|
ec2075c874
|
刀具岗权限调整
|
2024-09-20 10:32:30 +08:00 |
|
liaodanlong
|
6711f6f6e6
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-09-09 17:37:21 +08:00 |
|
liaodanlong
|
7ac7077f8c
|
bom物料清单
|
2024-09-09 17:36:23 +08:00 |
|
胡尧
|
ed20249988
|
Accept Merge Request #1286: (feature/流程用扫码完成 -> develop)
Merge Request: 扫码触发页面按钮，解除装夹起始站点根据下产线终点站点自动赋值
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1286
|
2024-09-09 17:31:25 +08:00 |
|
胡尧
|
096542c8ff
|
扫码触发按键功能
|
2024-09-06 09:37:05 +08:00 |
|
胡尧
|
388929f207
|
扫码触发按键功能
|
2024-09-05 17:59:55 +08:00 |
|
hujiaying
|
18b0cc6ea0
|
Merge remote-tracking branch 'origin/develop' into feature/仓库发货下发bfm
|
2024-09-05 09:38:40 +08:00 |
|
hujiaying
|
54d9902ae4
|
撤回修改
|
2024-09-05 09:26:05 +08:00 |
|
hujiaying
|
eff39a39e3
|
修改 cloud端新建表面工艺参数必填参数不能填写
|
2024-09-05 09:24:45 +08:00 |
|
jinling.yang
|
f251878637
|
优化工单工序,优化表面工艺排序
|
2024-08-29 19:53:37 +08:00 |
|
胡尧
|
7ac09653c3
|
Accept Merge Request #1258: (feature/agv_dispatch -> develop)
Merge Request: 修改日期序列的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1258
|
2024-08-27 16:49:35 +08:00 |
|
胡尧
|
9c3ed0166b
|
修改日期序列的bug
|
2024-08-27 16:49:04 +08:00 |
|
jinling.yang
|
a3357e01aa
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺排序
# Conflicts:
# sf_manufacturing/models/stock.py
# sf_mrs_connect/controllers/controllers.py
|
2024-08-27 11:34:39 +08:00 |
|
hujiaying
|
fbbce6332d
|
修改表面工艺同步测试，删除同步交期，同步周期菜单及同步接口
|
2024-08-26 15:02:33 +08:00 |
|
hujiaying
|
89cb61f244
|
修改同步表面工艺
|
2024-08-26 12:47:15 +08:00 |
|
hujiaying
|
deef246a6d
|
修改表面工艺字段同步
|
2024-08-26 11:10:52 +08:00 |
|
jinling.yang
|
f5e36f601c
|
还原注释代码
|
2024-08-25 15:01:11 +08:00 |
|
jinling.yang
|
9218633a5e
|
优化表面工艺
|
2024-08-23 17:32:35 +08:00 |
|
胡尧
|
a8211171b0
|
增加以日、月、年为日期期间的序列，工件配送单状态同步，返工时不生成工件配送单
|
2024-08-20 16:18:47 +08:00 |
|
胡尧
|
a767c6491f
|
增加移除焦点的controller
|
2024-08-20 14:05:05 +08:00 |
|
yuxianghui
|
e92c9675b6
|
1、 处理 内部调拨单，在选择目标货位时，隐藏带循环货位标签的货位不进行展示
|
2024-08-05 17:18:54 +08:00 |
|
yuxianghui
|
a5da18bbc7
|
1、修改夹具重量单位为kg
|
2024-08-01 11:34:20 +08:00 |
|
yuxianghui
|
83334e2915
|
1、表面工艺及同步接口添加‘加工天数’、‘路途天数’字段；2、表面工艺可选参数及同步接口添加‘工艺描述’、‘加工天数’、‘路途天数’字段
|
2024-07-16 14:10:14 +08:00 |
|
yuxianghui
|
1672a3982e
|
1、完成 SF材料材料型号缺陷优化 bug
|
2024-07-05 17:09:32 +08:00 |
|
yuxianghui
|
3b24f90385
|
1、工单添加按Rfid搜索，隐藏多余的Rfid字段；2、优化程序创建日期；
|
2024-06-28 14:20:57 +08:00 |
|
禹翔辉
|
f005a29beb
|
Merge branch refs/heads/develop into refs/heads/release/release_1.8
|
2024-06-25 09:47:34 +08:00 |
|
yuxianghui
|
95e89d8979
|
1
|
2024-06-24 17:10:39 +08:00 |
|
jinling.yang
|
828b4b0f6b
|
修复功能刀具清单列表
|
2024-06-24 16:55:42 +08:00 |
|
yuxianghui
|
a82a54c464
|
1、功能刀具清单做编辑控制；2、刀具拆解——报废优化；3、功能刀具出入库添加刀具跳转；
|
2024-06-24 15:40:51 +08:00 |
|
jinling.yang
|
e453508f17
|
修改功能刀具清单查询列表:部分字段不可更改
|
2024-06-24 14:18:42 +08:00 |
|
mgw
|
3ab378f3bd
|
修复会计凭证借贷无法输入的问题
|
2024-05-30 16:48:02 +08:00 |
|
mgw
|
a4b2d5bb42
|
修复仓储岗位权限遗留问题
|
2024-05-18 10:29:02 +08:00 |
|
yuxianghui
|
20ecd9d949
|
1、将和刀具相关的模型的刀具直径字段类型从int改为float；2、标准刀库tree视图添加Rfid字段；优化从中控获取标准刀库信息接口；
|
2024-05-16 14:04:35 +08:00 |
|
yuxianghui
|
1c441d388f
|
1、序列号模型添加Rfid字段的重复校验；功能刀具模型优化搜索视图的字段；优功能刀具组装流程的值
|
2024-05-16 09:41:57 +08:00 |
|
yuxianghui
|
0f47f7c3b8
|
1、添加权限；2、设备的设备检修标准字段关闭创建功能；3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug；4、关闭仓库创建按钮
|
2024-05-13 11:54:03 +08:00 |
|
jinling.yang
|
76b7d00643
|
1.模版类型的成品，坯料，表面工艺模版的工序新增过滤2.表面工艺可选参数的适用材料修改为可编辑
|
2024-05-11 15:35:15 +08:00 |
|
mgw
|
8c279828be
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-05-09 09:25:19 +08:00 |
|
mgw
|
5c68dd45ee
|
补充提交代码
|
2024-05-09 09:21:13 +08:00 |
|
mgw
|
af822c9039
|
增加邮件发送公用类
|
2024-05-08 21:49:04 +08:00 |
|