shun
|
36f37a4444
|
无锡喜德看板优化
|
4 years ago |
许心洁
|
b3a7d77087
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
abc5a9b812
|
BUG#新增需求：13580
|
4 years ago |
joke.wang
|
b702c92c42
|
半成品报表
|
4 years ago |
陈思洁
|
76f8675ac1
|
【13525 20027-QMES首页“产线一次合格率”没有根据“日月年”筛选条件查询数据-20201230】
|
4 years ago |
wynne1005
|
32ed3d388f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
7609d3449c
|
添加lob字段
|
4 years ago |
|
shun
|
ad0ddbf65e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
 曾贞一
|
5ebb37173d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
曾贞一
|
aae3fb2539
|
【未完成单据提交-优化】
|
4 years ago |
simon.song
|
f51ad83cc0
|
返修记录报表查询条件去掉模糊查询，增加【产品条码】查询条件
|
4 years ago |
 王杰
|
58c7b6854b
|
pom
|
4 years ago |
|
曾贞一
|
2e13f7e3f9
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
曾贞一
|
bbd5dccbf8
|
【合并分支】
|
4 years ago |
Dominic_Xiao
|
5e8e563a81
|
修改基础模块:炉子图片由与位置绑定改为与模式绑定
|
4 years ago |
 钮海涛
|
a82d657366
|
修复坤泰问题
|
4 years ago |
|
simon.song
|
9dbfc00e6f
|
13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29
|
4 years ago |
|
simon.song
|
9ba8ae781d
|
13493 20027-控制计划--点击编辑，导入数据优化--2020-12-29
|
4 years ago |
|
陈思洁
|
f4ffa95c4b
|
【13470 20027--BI详情----生产质量情况--工位合格率浮窗显示内容优化----2020-12-28】
|
4 years ago |
|
Dominic_Xiao
|
11e2d8e9f9
|
卡斯马报废率趋势报表
|
4 years ago |
|
王杰
|
b25641e02b
|
数据复核
|
4 years ago |
puxiao.liao
|
db8c01b64c
|
修复天津BUG
|
4 years ago |
|
王杰
|
0906539b82
|
总装 数据复核
|
4 years ago |
|
许心洁
|
a9fc8ae132
|
喜德WMS：BUG#13293，13295，13294
|
4 years ago |
|
钮海涛
|
b843db89d9
|
静态盘点查询单据查询不到数据问题修复
|
4 years ago |
|
陈思洁
|
d1532067b7
|
【3063 不良品处理模块-添加基础配置界面 --后端】
|
4 years ago |
|
puxiao.liao
|
129002573c
|
Fix bug#13399
|
4 years ago |
duan.yang
|
0db629a2a1
|
BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
王杰
|
605d620565
|
工位跳过记录
|
4 years ago |
|
puxiao.liao
|
8657926eee
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
4937b49281
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
王杰
|
183a642c52
|
天津 安灯类型 增加 模具
|
4 years ago |
|
puxiao.liao
|
36d4f0ac10
|
修复天津麦格纳问题
|
4 years ago |
|
陈思洁
|
8edd1cc336
|
【3057 包装履历报表 - 后端开发】
|
4 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
yumingxing
|
1081b3a972
|
报表
|
4 years ago |
|
Dominic_Xiao
|
0cec15c1ba
|
修改基础模块:炉子图片由与位置绑定改为与模式绑定
|
4 years ago |
|
simon.song
|
4e78dc93b0
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
0ee41dbda1
|
13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29
|
4 years ago |
|
钮海涛
|
eea1084f84
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
6bfc2f92b0
|
修复坤泰问题
|
4 years ago |
|
simon.song
|
a86a189fc3
|
13493 20027-控制计划--点击编辑，导入数据优化--2020-12-29
|
4 years ago |
|
Dominic_Xiao
|
e62bdb1f60
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
|
王林
|
03aefdfd9b
|
Merge branch 'dev' of frank.yu/i3plus-pojo into dev
|
4 years ago |
|
yumingxing
|
04df1faa4f
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
Dominic_Xiao
|
46bbe0492d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
Dominic_Xiao
|
6bd2d191a3
|
卡斯马报废率趋势报表
|
4 years ago |
 廖湘明
|
7f76e2ac02
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
陈思洁
|
b7a0966a16
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
9a8515eeb9
|
【13470 20027--BI详情----生产质量情况--工位合格率浮窗显示内容优化----2020-12-28】
|
4 years ago |
|
廖湘明
|
747312eaa3
|
1.包装查询报表
2.一次性通过率报表
|
4 years ago |
|
yumingxing
|
7857ba714c
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
yumingxing
|
e178bb8c67
|
生产统计报表+报废占比柏拉图报表
|
4 years ago |
|
王杰
|
cafac4312b
|
数据复核
|
4 years ago |
|
陈思洁
|
587e4f5db1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
3a98640d5d
|
【3063 不良品处理模块-添加基础配置界面 --后端】
|
4 years ago |
|
王杰
|
2e03c7b3f5
|
Merge branch 'dev' of frank.yu/i3plus-pojo into dev
|
4 years ago |
|
钮海涛
|
70b80068c2
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
56630ccb0d
|
静态盘点查询单据查询不到数据问题修复
|
4 years ago |
|
puxiao.liao
|
7880fc96c9
|
修复天津BUG
|
4 years ago |
|
廖湘明
|
5e43c32131
|
1.包装查询报表
2.一次性通过率报表
|
4 years ago |
|
廖湘明
|
29500d8762
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
廖湘明
|
61364e2170
|
包装查询报表
|
4 years ago |
汪云昊
|
2cfbe85ab6
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
718466b8df
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
汪云昊
|
60ef8f3b96
|
feat(sms):平台短信功能
|
4 years ago |
|
许心洁
|
8c26a27218
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
819a4312ae
|
喜德WMS：BUG#13293，13295，13294
|
4 years ago |
|
王杰
|
5a0c89f79b
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
4 years ago |
|
王杰
|
b20fc8e552
|
总装 数据复核
|
4 years ago |
|
陈思洁
|
fefa52c9d2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
04f1da7f3f
|
【3057 包装履历报表 - 后端开发】
|
4 years ago |
|
puxiao.liao
|
7e400a1a68
|
Fix bug#13399
|
4 years ago |
|
duan.yang
|
f210767332
|
BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
王杰
|
2ccee2523a
|
工位跳过记录
|
4 years ago |
|
yumingxing
|
1bebe59cc2
|
产品履历报表+全工序报废率报表
|
4 years ago |
|
puxiao.liao
|
87dcbd64f8
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
4e0cab2f6a
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
d7d387e77c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
王杰
|
f63baa9c1a
|
天津 安灯类型 增加 模具
|
4 years ago |
|
puxiao.liao
|
7fcdae795c
|
修复天津麦格纳问题
|
4 years ago |
|
yumingxing
|
6b443a7d04
|
产品履历报表+全工序报废率报表
|
4 years ago |
|
yumingxing
|
404cab525a
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
yumingxing
|
13ca332c4b
|
产品履历报表+全工序报废率报表
|
4 years ago |
|
钮海涛
|
baed7db4ed
|
合并dev代码
|
4 years ago |
|
钮海涛
|
48b4e45850
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
4 years ago |
|
钮海涛
|
6e5ea4462f
|
合并master代码
|
4 years ago |
|
钮海涛
|
977b8ac23c
|
Merge remote-tracking branch 'remotes/origin/test'
|
4 years ago |
|
钮海涛
|
05dca352dd
|
修改订单履历功能
|
4 years ago |
|
puxiao.liao
|
268c04ddf3
|
Fix bug#13229
|
4 years ago |
|
yumingxing
|
4ec01b61f7
|
产品履历报表+全工序报废率报表
|
4 years ago |
|
joke.wang
|
50558289e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
b58904bd94
|
国际化优化
|
4 years ago |
|
simon.song
|
cbf86c2f7e
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
cb51636bd2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
simon.song
|
c016cb734b
|
去掉模糊查询
|
4 years ago |
|
puxiao.liao
|
6c2569ee92
|
盘点优化
|
4 years ago |
|
钮海涛
|
ded63e25db
|
坤泰问题修复
|
4 years ago |
|
陈思洁
|
cf109c6773
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
419fe3a62e
|
【13330 20027--BI详情----产线运行情况--计划完成率浮窗显示内容优化--2020-12-18】
|
4 years ago |
|
simon.song
|
3c6b869821
|
13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18
|
4 years ago |
|
simon.song
|
fa9a989cbd
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
23bbde2057
|
13315 20027-返修记录报表增加显示产品二维码-202012-26
|
4 years ago |
|
shun
|
c067c671a9
|
无锡喜德
|
4 years ago |
|
simon.song
|
ade9053502
|
13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18
|
4 years ago |
|
Dominic_Xiao
|
97e919552a
|
修改基础模块的描述名
|
4 years ago |
|
shun
|
6f9d4b4342
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
王杰
|
d089d0fba8
|
Merge branch 'test' into dev
|
4 years ago |
|
陈思洁
|
107f3828f9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
cc99971690
|
【13140 20027-管理端增加包装箱条码与产品二维码的数据信息界面--20201221】
|
4 years ago |
|
许心洁
|
1595f68723
|
任务#3036
|
4 years ago |
|
王杰
|
7e8970f3e2
|
数据复核
|
4 years ago |
|
shun
|
fb4e79b899
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
shun
|
2fd1b89425
|
无锡喜德WMS看板
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
simon.song
|
0b1ef2290d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
d648228b18
|
13300 20027-控制计划--点击生效没有响应--2020-12-16
|
4 years ago |
|
joke.wang
|
95e92168d9
|
物料追溯批次model
|
4 years ago |
|
joke.wang
|
c0d3eb807f
|
物料批次追溯报表
|
4 years ago |
廖普小
|
c45d4e8aaf
|
Merge branch 'test' of channing.zhang/i3plus-pojo into test
|
4 years ago |
|
钮海涛
|
4116dc6b91
|
修复坤泰问题
|
4 years ago |
|
许心洁
|
3f72f2ac66
|
合并TEST分支代码
|
4 years ago |
|
许心洁
|
3cf59e9edc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
88d2eefcc8
|
供应商信息中的供应商地址因为之前漏加自定义搜索注解，导致界面上无法维护，现修复
|
4 years ago |
liangyao
|
9f1312e906
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
liangyao
|
ae2469e463
|
北京领料任务提交
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
许心洁
|
1474be7486
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
30a6ef7ba5
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
3467893051
|
1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读
2.更正生产计划对象属性woekorderNo->workOrderNo
3.将脚本异常往外抛
4.优化通用脚本接口
|
4 years ago |
|
曾贞一
|
15452dfa0e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
b695ab2fc3
|
【10202 20011--发运一步法配料时】
|
4 years ago |
|
王杰
|
08a458cee2
|
unpack
|
4 years ago |
|
钮海涛
|
56876e8cba
|
修复天津麦格纳问题
|
4 years ago |
|
钮海涛
|
cfcde79f1f
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
230895c243
|
修复天津麦格纳问题
|
4 years ago |
|
puxiao.liao
|
45201c42d3
|
盘点优化
|
4 years ago |
|
wynne1005
|
b7c4e76163
|
增加joined注解
|
4 years ago |
|
puxiao.liao
|
eb56d52e17
|
盘点优化
|
4 years ago |
|
钮海涛
|
7a7169386a
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
c4023d4bac
|
坤泰问题修复
|
4 years ago |
|
joke.wang
|
ef971201e3
|
泰国新条码生成
|
4 years ago |
|
puxiao.liao
|
0bb69b6505
|
优化盘点
|
4 years ago |
|
钮海涛
|
3b700e722c
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
wynne1005
|
b438735172
|
Merge branch 'test' into ext-dev
|
4 years ago |
rock.yu
|
2f912b2334
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
rock.yu
|
fe23cab34b
|
增加实体扩展注解
|
4 years ago |
|
钮海涛
|
231c4b015a
|
修复坤泰采购收货卡控包装物料，二次判定库存条码库位，存储区，仓库信息未更新问题
|
4 years ago |
|
wynne1005
|
78d86be2f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
8741facd02
|
中航BI修改 数据同步打印错误日志
|
4 years ago |