pangyang
|
a323d9d5ea
|
Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr
|
4 weeks ago |
|
pangyang
|
87cf873711
|
生产处置单提交erp修改
|
4 weeks ago |
qinyulong
|
2ef051473d
|
外协：异步批量审批、批量结算
|
4 weeks ago |
绫Umbrella
|
466b209d5d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java
# blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
|
4 weeks ago |
|
绫Umbrella
|
7c60798dc8
|
修改powerjob
|
4 weeks ago |
|
pangyang
|
49c93b1da2
|
desk提交代码修改
|
4 weeks ago |
liuqingkun
|
6fadca9e12
|
添加玻璃饼订单、烧结模具计划feign接口
|
4 weeks ago |
|
pangyang
|
b99d091c63
|
电子档案，热表打印未写完
|
1 month ago |
|
pangyang
|
08af3ccff6
|
电子档案，热表打印未写完
|
1 month ago |
|
pangyang
|
ae76e79f0b
|
电子档案，基础数据日志
|
1 month ago |
|
qinyulong
|
2a609f7965
|
外协相关表+量具计量记录表+车间订单运行记录表字段变更-sql
|
1 month ago |
|
qinyulong
|
4c55c82921
|
设备+转岗+外协操作日志
|
1 month ago |
|
qinyulong
|
e9736985de
|
外协分批功能；
转厂内审批通过后处理包装工序 并且工艺能力包含 包装 并且加工单位为空的
|
1 month ago |
|
pangyang
|
101f08b620
|
举手免责代码，生产标识查询
|
1 month ago |
李涛
|
aa21e02a13
|
工序报工修改
|
1 month ago |
|
李涛
|
1d597c3504
|
分批接口优化
|
1 month ago |
|
李涛
|
2ef400db70
|
分批接口优化
|
1 month ago |
|
qinyulong
|
e5736f7865
|
外协镀种规则字段顺序修改；
外协订单收回后，特殊外协处理暂时屏蔽
|
1 month ago |
|
绫Umbrella
|
cec7cac221
|
修复库位随机送，变成优先送内层，最后送外层
|
1 month ago |
liweidong-hj
|
7f3089638d
|
Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong
|
1 month ago |
|
liweidong-hj
|
440716137f
|
增加状态
|
1 month ago |
|
李涛
|
2bfdf99a95
|
工作台接口开发
|
1 month ago |
|
qinyulong
|
b27ba100aa
|
外协工序增加是否手动结算选项；
外协自动结算接口以供镀后入库调用；
车间运行订单表加入外协状态，查询增加选项；
外协审批查询增加审批通过逻辑；
报价单导出。
|
1 month ago |
|
pangyang
|
0c67b0f7ae
|
生产质量检验,举手免责代码
|
1 month ago |
|
liweidong-hj
|
1f575ac027
|
更新AGV类型判断
|
1 month ago |
|
绫Umbrella
|
b184306558
|
修复库位随机送，变成优先送内层，最后送外层
|
1 month ago |
|
绫Umbrella
|
06d2df67a1
|
代码修改
|
1 month ago |
|
liweidong-hj
|
9effb92a10
|
修改循环问题
|
1 month ago |
|
liweidong-hj
|
8714355dfd
|
任务结束 解绑
|
1 month ago |
|
liweidong-hj
|
1ee98e6290
|
Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong
|
1 month ago |
|
liweidong-hj
|
ea3d0ad8d6
|
梳齿架状态修改
|
1 month ago |
|
绫Umbrella
|
72f06f235a
|
代码修改
|
1 month ago |
|
liweidong-hj
|
cc2414e676
|
Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong
|
1 month ago |
|
liweidong-hj
|
173dbc6c68
|
绑定虚拟货架，释放虚拟货架
|
1 month ago |
|
绫Umbrella
|
c9b50abb14
|
代码修改
|
1 month ago |
|
liweidong-hj
|
8422f6ca0d
|
日志打印
|
1 month ago |
|
liweidong-hj
|
160496bb9b
|
整体状态修正
|
1 month ago |
 wusiyu
|
1cf50c7455
|
仓库管理字段注释更新
|
1 month ago |
|
pangyang
|
ee68008b43
|
生产质量检验 生产处置单页面查询
|
1 month ago |
|
liuqingkun
|
53fd8c9ac9
|
Merge remote-tracking branch 'origin/master'
|
1 month ago |
|
liuqingkun
|
78312bcb57
|
计划管理接口修改
erpdataFeign接口修改
|
1 month ago |
|
liweidong-hj
|
3c2ba44777
|
修改梳齿架子状态
|
1 month ago |
|
liweidong-hj
|
a9cb327fe6
|
Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr
|
1 month ago |
|
liweidong-hj
|
72927a198c
|
修改回调后的状态
|
1 month ago |
|
绫Umbrella
|
84fe2c1723
|
代码修改
|
1 month ago |
|
liweidong-hj
|
0c82e3230c
|
物流日志打印
|
1 month ago |
|
pangyang
|
b9faefa686
|
生产质量检验和生产处置单修改
|
1 month ago |
|
qinyulong
|
1fe1bd9c68
|
外协结算预结算预览；
外协结算预结算导出；
外协结算审核；
外协结算无需结算；
外协工序加入是否自动结算；
部分基础数据表表名变更；
|
1 month ago |
|
绫Umbrella
|
73ecd41f41
|
代码修改
|
1 month ago |
|
liweidong-hj
|
04c9d888ee
|
暂存
|
1 month ago |
