zpl
|
4587d94bf6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
fb3c6fd638
|
标签打印是否主观件
|
3 years ago |
|
zpl
|
e437fad1fb
|
报表
|
3 years ago |
philip
|
72468db1e8
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
18df19141e
|
检验项目删除
|
3 years ago |
赵嘉伟
|
9c78e2b98a
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
56599d67b0
|
待办事项
|
3 years ago |
|
zpl
|
a17f3bca63
|
打印超时3分钟
|
3 years ago |
|
zpl
|
b4aecf5dcd
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
89587b6ab1
|
是否主观件
|
3 years ago |
|
赵嘉伟
|
0caa578603
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
30c739062d
|
根据sfc查处workCenter
|
3 years ago |
|
philip
|
2e2601b291
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
0a3bd1543a
|
检验任务编号
|
3 years ago |
|
zpl
|
951b6df3ff
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
859ddefaf4
|
报表模块放在common
|
3 years ago |
|
philip
|
6069052105
|
产前准备增加条件
|
3 years ago |
|
philip
|
fc0285bf3c
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
dc272560d2
|
生产准备增加条件
|
3 years ago |
Limy
|
6104256f19
|
ERP接口调试。
|
3 years ago |
|
Limy
|
c87625d313
|
ERP接口调试。
|
3 years ago |
Leon
|
ece142b818
|
生产环境ERP接口问题处理
|
3 years ago |
|
Leon
|
0908199135
|
配置文件修改。
|
3 years ago |
|
philip
|
11c7a962a8
|
erp接口
|
3 years ago |
|
philip
|
1d51db451e
|
erp
|
3 years ago |
|
philip
|
6d85aa2f65
|
报工
|
3 years ago |
|
赵嘉伟
|
fb2e89d3fe
|
产品报废
|
3 years ago |
|
赵嘉伟
|
631c4ad3e0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
07a039a9e7
|
产品报废
|
3 years ago |
|
philip
|
25f55926cd
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
6c96fe99cc
|
工时计算
|
3 years ago |
|
Leon
|
0fcfaac9d6
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
3 years ago |
|
Leon
|
f4ea23fc03
|
生产派工和物料修改。
|
3 years ago |
|
zpl
|
5bf938b75e
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
32ee34c51a
|
点检优化
|
3 years ago |
|
Leon
|
48f2bb515c
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
3 years ago |
|
Leon
|
77f4c55979
|
拆分修改保存派工数据
|
3 years ago |
|
philip
|
5684684300
|
产前准备准备完成不包含已打印
|
3 years ago |
|
zpl
|
d14d4692f0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
2838ab4a7e
|
标签打印优化
|
3 years ago |
|
philip
|
814e7e68b3
|
工序描述
|
3 years ago |
|
philip
|
bd5a8ccdf0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
bc81539ac5
|
打印
|
3 years ago |
|
zpl
|
87e6dc413c
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
53d7c472cf
|
打印请求
|
3 years ago |
|
philip
|
786c371f5d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
abc2b9b07b
|
成品标签加项目号
|
3 years ago |
|
zpl
|
eb02cd1d08
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
09a57fad02
|
打印请求
|
3 years ago |
|
philip
|
0a5877ec4a
|
点检
|
3 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
|
3 years ago |
|
Leon
|
8ccf921943
|
质量修改检验任务问题。
|
3 years ago |
|
Leon
|
dd6fd856c5
|
质量修改检验任务问题。
|
3 years ago |
|
philip
|
3805f3d0be
|
专检
|
3 years ago |
|
philip
|
6d94c9abc5
|
产前准备增加已打印筛选
|
3 years ago |
|
philip
|
d6c7374221
|
专检创建新任务，成品标签
|
3 years ago |
|
philip
|
54772894f5
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
bb90cf6a5d
|
车间转入转出
|
3 years ago |
|
zpl
|
8787204083
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
9f1d9862d3
|
新增SFC标签打印功能
|
3 years ago |
|
赵嘉伟
|
38c1b224a8
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
3d317c1c1e
|
生产派工发布
|
3 years ago |
|
philip
|
ecc09e4e86
|
打印次数
|
3 years ago |
|
zpl
|
2b99ad1016
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
5eac000492
|
功能修改
|
3 years ago |
|
赵嘉伟
|
af51295f35
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
48388b41f7
|
异常bug修改，异常逻辑修改
|
3 years ago |
|
Leon
|
952be848f5
|
生产派工实际时间显示
|
3 years ago |
|
zpl
|
2bddd95c28
|
功能优化
|
3 years ago |
|
赵嘉伟
|
55afd862f7
|
异常消息发送
|
3 years ago |
|
赵嘉伟
|
b3027b8b1e
|
异常消息发送
|
3 years ago |
|
philip
|
9d0786e2e2
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
philip
|
8d4bd65347
|
增加下料描述
|
3 years ago |
|
Leon
|
eae2dfd36a
|
Merge remote-tracking branch 'mesnac/master'
|
3 years ago |
|
Leon
|
69c3e2fabf
|
报表工具
|
3 years ago |
|
zpl
|
d123c530a4
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
Leon
|
2e2b9a9928
|
Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
|
3 years ago |
|
Leon
|
845f7a785b
|
报表工具
|
3 years ago |
|
zpl
|
cc4fd3e7bd
|
打印bug修改
|
3 years ago |
|
赵嘉伟
|
5c42465472
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
f84ade0111
|
异常发送消息
|
3 years ago |
|
zpl
|
c7c9b3d156
|
界面修改
|
3 years ago |
|
philip
|
ce9152b5e2
|
产前准备PDA
|
3 years ago |
|
赵嘉伟
|
881f141269
|
ActiveMQUtil
|
3 years ago |
|
zpl
|
94f84ac3bc
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
400170d0e0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
赵嘉伟
|
e373102a9e
|
ActiveMQUtil发送消息
|
3 years ago |
|
zpl
|
102a1e17bb
|
标签打印新增物料查询
|
3 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
|
3 years ago |
|
Leon
|
70f1482493
|
生产派工测试问题处理
|
3 years ago |
|
zpl
|
57157ecc61
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
8978428501
|
标签打印修改
|
3 years ago |
|
zpl
|
217451e75f
|
标签打印的打印机修改
|
3 years ago |
|
philip
|
ba12736be3
|
辅料使用
|
3 years ago |
|
zpl
|
a41cb639ed
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zpl
|
54a07a32b4
|
打印查询功能修改
|
3 years ago |
|
philip
|
ef2378390a
|
不合格代码修改
|
3 years ago |
|
zpl
|
bc176f173e
|
标签打印修改
|
3 years ago |
|
zpl
|
dffd98413d
|
标签打印模板修改
|
3 years ago |
|
zpl
|
62e61258b9
|
设备点检、维修用户名称、不良描述获取
|
3 years ago |