zpl
|
de4761384f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
785b6919e0
|
生产叫料PC、pda界面；车间发料pda界面。规格模糊查询改精确查询
|
3 years ago |
Leon
|
637a25ed77
|
生产派工导入人员按姓名修改功能。
|
3 years ago |
|
Leon
|
5001803479
|
配置文件修改。
|
3 years ago |
|
Leon
|
e0d3b63197
|
生产派工规格检索按照精确查找
|
3 years ago |
|
Leon
|
67ad5556a3
|
修改派工单人员必输，主关件判断逻辑。
|
3 years ago |
|
Leon
|
655b40d4cf
|
批次拆分修改派工数量&导出中文查询参数乱码问题处理。
|
3 years ago |
philip
|
ff121496a9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# common/src/main/resources/mapper/ReportDataMapper.xml
|
3 years ago |
|
philip
|
5bc909d374
|
拆分派工加参数，报表
|
3 years ago |
|
Leon
|
e293b7cc62
|
生产派工人员单独记录
|
3 years ago |
|
Leon
|
c4bda6fe3d
|
生产派工人员单独记录
|
4 years ago |
|
Leon
|
e6deb0b820
|
生产派工&甘特图&质量代办事项修改。
|
4 years ago |
|
Leon
|
4809f0c219
|
MQ连接配置问题修改
|
4 years ago |
赵嘉伟
|
30c739062d
|
根据sfc查处workCenter
|
4 years ago |
Limy
|
c87625d313
|
ERP接口调试。
|
4 years ago |
|
Leon
|
66374d071e
|
生产环境ERP接口问题处理
|
4 years ago |
|
zpl
|
08abc7e7f5
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
zpl
|
fa4d9bfb15
|
车间发料PDA新增材质、规格模糊查询，展示列新增需求件数
|
4 years ago |
|
赵嘉伟
|
ee1611a1e0
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
5548aa0243
|
异常计划待办事项
|
4 years ago |
|
zpl
|
b7efdd03f9
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
21b7e5ba06
|
报工、发料
|
4 years ago |
|
赵嘉伟
|
631c4ad3e0
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
07a039a9e7
|
产品报废
|
4 years ago |
|
philip
|
25f55926cd
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
6c96fe99cc
|
工时计算
|
4 years ago |
|
Leon
|
f4ea23fc03
|
生产派工和物料修改。
|
4 years ago |
|
philip
|
9c458ac9e9
|
工序描述
|
4 years ago |
|
Leon
|
48f2bb515c
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
77f4c55979
|
拆分修改保存派工数据
|
4 years ago |
|
zpl
|
62212348cb
|
叫料PDA新增——材质、规格字段
|
4 years ago |
|
Leon
|
32ed7520d8
|
生产派工查询条件修改。
|
4 years ago |
|
Leon
|
cabff3e6af
|
派工增加查询字段
|
4 years ago |
|
Leon
|
1f090f3466
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
# anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
# anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
# anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
# anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
# anomaly/src/main/resources/mapper/ReportMapper.xml
# quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
|
4 years ago |
|
Leon
|
dd6fd856c5
|
质量修改检验任务问题。
|
4 years ago |
|
philip
|
e002e2dfe3
|
拆分不传车间，派工弹出框
|
4 years ago |
|
Leon
|
d0666401f1
|
叫料修改：装配只叫辅料类型为9的，其他叫原材料。
|
4 years ago |
|
赵嘉伟
|
3d317c1c1e
|
生产派工发布
|
4 years ago |
|
zpl
|
b93de8dba7
|
功能修改
|
4 years ago |
|
zpl
|
2b99ad1016
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
fb9d3908be
|
bug修复
|
4 years ago |
|
赵嘉伟
|
0d2905b383
|
余料退回明细表
|
4 years ago |
|
赵嘉伟
|
74c629c0ca
|
零件加工报表
|
4 years ago |
|
赵嘉伟
|
eafc1225a5
|
零件加工进度表
|
4 years ago |
|
赵嘉伟
|
928b12de7f
|
余料退回明细表
|
4 years ago |
|
Leon
|
ea3e2c5c9f
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
79fba83a37
|
派工单导入修改
|
4 years ago |
|
zpl
|
2bddd95c28
|
功能优化
|
4 years ago |
|
zpl
|
6050a26fba
|
余料打印bug修改
|
4 years ago |
|
zpl
|
754a5e27d0
|
车间发料修改
|
4 years ago |
|
zpl
|
b0f9b43c87
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
9d23692c48
|
车间发料修改
|
4 years ago |
|
Leon
|
0ca4dec56e
|
派工单刷新报错，修改处理。
|
4 years ago |
|
Leon
|
f0debbb52a
|
工单整理下达报错修改
|
4 years ago |
|
Leon
|
b497fd94a9
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
76bf6243c5
|
工单整理下达报错修改
|
4 years ago |
|
zpl
|
f740da5672
|
车间发料修改
|
4 years ago |
|
Leon
|
2e2b9a9928
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
845f7a785b
|
报表工具
|
4 years ago |
|
zpl
|
fcdc7a93cd
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
c7c9b3d156
|
界面修改
|
4 years ago |
|
赵嘉伟
|
59454f195a
|
userResource提交
|
4 years ago |
|
赵嘉伟
|
88f40558cb
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
1f3e67c8b0
|
userResource提交
|
4 years ago |
|
zpl
|
00517d55d3
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
531e8cbd89
|
生产叫料数据查询功能修改
|
4 years ago |
|
Leon
|
fe20048264
|
派工工作中心查询修改
|
4 years ago |
|
Leon
|
dd01cb8dda
|
派工人员问题处理
|
4 years ago |
|
Leon
|
c7b50a9725
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
0443ecfd60
|
派工人员问题处理
|
4 years ago |
|
zpl
|
94f84ac3bc
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
40c3245f76
|
叫料查询修改
|
4 years ago |
|
Leon
|
98e48c755d
|
派工人员问题处理
|
4 years ago |
|
zpl
|
5849272dc3
|
叫料权限修改
|
4 years ago |
|
Leon
|
401a56439e
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
# common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
# dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
# meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
# meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java
# meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java
# meapi/src/main/resources/mapper/UserGroupMapper.xml
|
4 years ago |
|
Leon
|
70f1482493
|
生产派工测试问题处理
|
4 years ago |
|
zpl
|
8b6b9090a4
|
余料标签修改
|
4 years ago |
|
zpl
|
220e27039e
|
叫料pda功能修改
|
4 years ago |
|
zpl
|
588d94f13b
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
ce872c2bb1
|
叫料pda界面修改
|
4 years ago |
|
philip
|
fcb84abe06
|
派工单弹出框检索
|
4 years ago |
|
philip
|
85fb8c5b99
|
开始完成修改派工开始完成时间
|
4 years ago |
|
zpl
|
895071aa60
|
设备模块修改
|
4 years ago |
|
zpl
|
dffd98413d
|
标签打印模板修改
|
4 years ago |
|
philip
|
96369b1a62
|
产前准备任务检索修改
|
4 years ago |
|
zpl
|
7980402005
|
生产叫料修改
|
4 years ago |
|
Leon
|
a0d55d759a
|
叫料查询BUG修改
|
4 years ago |
|
zpl
|
90d507d83b
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
49ca453631
|
生产叫料PDA修改
|
4 years ago |
|
Leon
|
63e9c0277a
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
617a56fde0
|
物料模块BUG修改
|
4 years ago |
|
zpl
|
41a2830064
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
76211d85fa
|
生产叫料PDA修改
|
4 years ago |
|
Leon
|
039381b1af
|
工单整理查询计划工艺路线修改
|
4 years ago |
|
Leon
|
e0f30651c2
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
509ebc4f6f
|
工单整理查询计划工艺路线修改
|
4 years ago |
|
赵嘉伟
|
609511900b
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
8c7d86ff5b
|
用户资源表
|
4 years ago |
|
Leon
|
cc22b9d245
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
6cf48654c7
|
工单整理修改车间取值逻辑
|
4 years ago |