philip
|
5afde21345
|
图纸查看
|
3 years ago |
赵嘉伟
|
9a657ed683
|
异常发送消息通知
|
3 years ago |
|
philip
|
291a25dee4
|
增加导出列宽度
|
3 years ago |
|
philip
|
c491ef775f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
0825e222c6
|
一次合格率报表
|
3 years ago |
Leon
|
628801c013
|
物料接口调整修改。
|
3 years ago |
|
philip
|
3e5134e12a
|
报工接口401手动重发
|
3 years ago |
zpl
|
ad907f84af
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
44f960fa6f
|
每日生产状态报表新增展示列检验人员
|
3 years ago |
|
赵嘉伟
|
6bc6898dd5
|
报表修改
|
3 years ago |
|
zpl
|
c0ce4fb4c4
|
设备类型负荷率报表调整
|
3 years ago |
|
philip
|
2323fdbac8
|
报工传标准工时
|
3 years ago |
|
philip
|
daad2e4a8e
|
报表
|
3 years ago |
|
zpl
|
a22e9756ca
|
设备、设备类型负荷率报表修改
|
3 years ago |
|
zpl
|
4ee3747927
|
资源符合率报表新增计划使用率查询
|
3 years ago |
|
Leon
|
5a8fc02c40
|
Merge remote-tracking branch 'mesnac/master'
|
3 years ago |
|
Leon
|
e8d9aa02d7
|
标签打印参数类合并重复修改。
|
3 years ago |
|
zpl
|
f3583fe8d5
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
4d2f5f9b99
|
资源负荷率报表调整
|
3 years ago |
|
philip
|
c53f4b1d9a
|
报表
|
3 years ago |
|
philip
|
8cf9d57efe
|
报表
|
3 years ago |
|
philip
|
a97d0fb1ce
|
导出修改
|
3 years ago |
|
zpl
|
4c1cb4967d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
7347fb4911
|
每日生产状态报表调整
|
3 years ago |
|
赵嘉伟
|
7606c37090
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
bab0b194ba
|
异常模块bug提交
|
3 years ago |
|
philip
|
67c07e515f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
02afeb08b3
|
修改
|
3 years ago |
|
zpl
|
f968e6d902
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
ec86e3b201
|
检验人员查询；每日生产状态报表；
|
3 years ago |
|
philip
|
f02a379a3e
|
专检任务编号修改
|
3 years ago |
|
zpl
|
16bbc89396
|
维修完成时，根据点检不合格，创建当日点检任务
|
3 years ago |
|
philip
|
6dba19e70d
|
找设备逻辑修改
|
3 years ago |
|
Leon
|
637a25ed77
|
生产派工导入人员按姓名修改功能。
|
3 years ago |
|
Leon
|
ee80ad3d9d
|
文件下载问题处理。
|
3 years ago |
|
赵嘉伟
|
5b4077faac
|
发送用户自定义字段
|
3 years ago |
|
philip
|
e7cbc73296
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
7d69ef3890
|
产前准备材质规格
|
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 |
|
zpl
|
f5f0549164
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
# common/src/main/resources/mapper/ReportDataMapper.xml
|
3 years ago |
|
zpl
|
3fe6bdef33
|
资源负荷率报表
|
3 years ago |
|
Leon
|
cf24e01775
|
生产派工人员单独记录
|
3 years ago |
|
Leon
|
d24410d76f
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
c4bda6fe3d
|
生产派工人员单独记录
|
4 years ago |
|
zpl
|
670da5b1f2
|
自制件打印，查询到多笔数据，返回一条数据；
|
4 years ago |
|
zpl
|
78d8b00a65
|
自制件打印，查询到多笔数据，返回一条数据；
|
4 years ago |
|
Leon
|
13fbc7e94e
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
9aa3c013a4
|
生产派工&甘特图&质量代办事项修改。
|
4 years ago |
|
zpl
|
05232d0a31
|
每日生产状态报表
|
4 years ago |
|
zpl
|
a6d4b86301
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
4751c67aa0
|
每日生产状态报表
|
4 years ago |
|
Leon
|
76804709d8
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
e6deb0b820
|
生产派工&甘特图&质量代办事项修改。
|
4 years ago |
|
philip
|
37a42e3ed5
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
f41e22a9a8
|
外协工序
|
4 years ago |
|
Leon
|
1a3f693cd4
|
MQ连接配置问题修改
|
4 years ago |
|
zpl
|
b3541be832
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
2b0ac9057f
|
SFC打印是否主观件
|
4 years ago |
|
philip
|
bea379c2cb
|
tostring
|
4 years ago |
|
zpl
|
4587d94bf6
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
fb3c6fd638
|
标签打印是否主观件
|
4 years ago |
|
zpl
|
e437fad1fb
|
报表
|
4 years ago |
|
philip
|
72468db1e8
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
18df19141e
|
检验项目删除
|
4 years ago |
|
赵嘉伟
|
9c78e2b98a
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
56599d67b0
|
待办事项
|
4 years ago |
|
zpl
|
a17f3bca63
|
打印超时3分钟
|
4 years ago |
|
zpl
|
b4aecf5dcd
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
89587b6ab1
|
是否主观件
|
4 years ago |
|
赵嘉伟
|
0caa578603
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
30c739062d
|
根据sfc查处workCenter
|
4 years ago |
|
philip
|
2e2601b291
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
0a3bd1543a
|
检验任务编号
|
4 years ago |
|
zpl
|
951b6df3ff
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
859ddefaf4
|
报表模块放在common
|
4 years ago |
|
philip
|
6069052105
|
产前准备增加条件
|
4 years ago |
|
philip
|
fc0285bf3c
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
dc272560d2
|
生产准备增加条件
|
4 years ago |
Limy
|
6104256f19
|
ERP接口调试。
|
4 years ago |
|
Limy
|
c87625d313
|
ERP接口调试。
|
4 years ago |
|
Leon
|
ece142b818
|
生产环境ERP接口问题处理
|
4 years ago |
|
Leon
|
0908199135
|
配置文件修改。
|
4 years ago |
|
philip
|
11c7a962a8
|
erp接口
|
4 years ago |
|
philip
|
1d51db451e
|
erp
|
4 years ago |
|
philip
|
6d85aa2f65
|
报工
|
4 years ago |
|
赵嘉伟
|
fb2e89d3fe
|
产品报废
|
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
|
0fcfaac9d6
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
f4ea23fc03
|
生产派工和物料修改。
|
4 years ago |
|
zpl
|
5bf938b75e
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
32ee34c51a
|
点检优化
|
4 years ago |
|
Leon
|
48f2bb515c
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
4 years ago |
|
Leon
|
77f4c55979
|
拆分修改保存派工数据
|
4 years ago |
|
philip
|
5684684300
|
产前准备准备完成不包含已打印
|
4 years ago |
|
zpl
|
d14d4692f0
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
2838ab4a7e
|
标签打印优化
|
4 years ago |
|
philip
|
814e7e68b3
|
工序描述
|
4 years ago |
|
philip
|
bd5a8ccdf0
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
bc81539ac5
|
打印
|
4 years ago |
|
zpl
|
87e6dc413c
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
53d7c472cf
|
打印请求
|
4 years ago |
|
philip
|
786c371f5d
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
abc2b9b07b
|
成品标签加项目号
|
4 years ago |
|
zpl
|
eb02cd1d08
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
09a57fad02
|
打印请求
|
4 years ago |
|
philip
|
0a5877ec4a
|
点检
|
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
|
8ccf921943
|
质量修改检验任务问题。
|
4 years ago |
|
Leon
|
dd6fd856c5
|
质量修改检验任务问题。
|
4 years ago |
|
philip
|
3805f3d0be
|
专检
|
4 years ago |
|
philip
|
6d94c9abc5
|
产前准备增加已打印筛选
|
4 years ago |
|
philip
|
d6c7374221
|
专检创建新任务，成品标签
|
4 years ago |
|
philip
|
54772894f5
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
bb90cf6a5d
|
车间转入转出
|
4 years ago |
|
zpl
|
8787204083
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
9f1d9862d3
|
新增SFC标签打印功能
|
4 years ago |
|
赵嘉伟
|
38c1b224a8
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
3d317c1c1e
|
生产派工发布
|
4 years ago |
|
philip
|
ecc09e4e86
|
打印次数
|
4 years ago |
|
zpl
|
2b99ad1016
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
zpl
|
5eac000492
|
功能修改
|
4 years ago |
|
赵嘉伟
|
af51295f35
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
48388b41f7
|
异常bug修改，异常逻辑修改
|
4 years ago |
|
Leon
|
952be848f5
|
生产派工实际时间显示
|
4 years ago |
|
zpl
|
2bddd95c28
|
功能优化
|
4 years ago |
|
赵嘉伟
|
55afd862f7
|
异常消息发送
|
4 years ago |
|
赵嘉伟
|
b3027b8b1e
|
异常消息发送
|
4 years ago |
|
philip
|
9d0786e2e2
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
philip
|
8d4bd65347
|
增加下料描述
|
4 years ago |
|
Leon
|
eae2dfd36a
|
Merge remote-tracking branch 'mesnac/master'
|
4 years ago |
|
Leon
|
69c3e2fabf
|
报表工具
|
4 years ago |
|
zpl
|
d123c530a4
|
Merge remote-tracking branch 'origin/master'
|
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
|
cc4fd3e7bd
|
打印bug修改
|
4 years ago |
|
赵嘉伟
|
5c42465472
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
f84ade0111
|
异常发送消息
|
4 years ago |
|
zpl
|
c7c9b3d156
|
界面修改
|
4 years ago |
|
philip
|
ce9152b5e2
|
产前准备PDA
|
4 years ago |
|
赵嘉伟
|
881f141269
|
ActiveMQUtil
|
4 years ago |
|
zpl
|
94f84ac3bc
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
400170d0e0
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
赵嘉伟
|
e373102a9e
|
ActiveMQUtil发送消息
|
4 years ago |
|
zpl
|
102a1e17bb
|
标签打印新增物料查询
|
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 |