小梁不胖
|
9508bd41ac
|
北京领料任务提交
|
4 years ago |
|
小梁不胖
|
f744b94e87
|
北京领料报表提交
|
4 years ago |
puxiao.liao
|
a62b10dc9d
|
修复合并异常
|
4 years ago |
 钮海涛
|
dfc18cc9b2
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
ffbc5d605e
|
喜德增加将PO及ASN订单的库存条码打印状态置为已打印的JOB
|
4 years ago |
|
钮海涛
|
6e6a9f7526
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
b5c994a18b
|
sweb同一供应商编码命名为VendorNo
|
4 years ago |
simon.song
|
8dcb1703c9
|
首检返回值字段调整
|
4 years ago |
|
simon.song
|
d0e1fcd440
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
56989acba2
|
12362 20027-管理端-首检检验结果报表状态已完成的对应的数量和已检数量显示有问题-20201115
|
4 years ago |
汪云昊
|
bad1234d0e
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
joke.wang
|
14c47545e7
|
查询备件库存修改
|
4 years ago |
|
汪云昊
|
7348d78238
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
 王杰
|
2b522ca15d
|
工步参数 增加字段
|
4 years ago |
|
王杰
|
183111cf65
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
4 years ago |
|
王杰
|
d64a8fd31c
|
工步参数 增加字段
|
4 years ago |
陈思洁
|
7e37a6e22d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
28da49aa29
|
【12422 19048 增加喷涂抛光条码查询报表 20201112】
|
4 years ago |
|
王杰
|
13868d5cd1
|
producesn 增加索引
|
4 years ago |
|
王杰
|
02d002b958
|
package detail 增加 联合索引
|
4 years ago |
|
puxiao.liao
|
c20922a455
|
Fix bug#12879
COGI调账支持出库单模式
|
5 years ago |
|
simon.song
|
9b57f47af6
|
修改pom文件
|
5 years ago |
|
simon.song
|
3917408421
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
陈思洁
|
d8d2dea922
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
陈思洁
|
a4093d18d1
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
rock.yu
|
785152dbfa
|
接口同步状态赋予默认值
|
5 years ago |
|
王杰
|
a94b5dd0b0
|
看板产线配置
|
5 years ago |
|
陈思洁
|
fd166bc0ff
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
47e6a86ecd
|
【天津bug修改】
|
5 years ago |
Dominic_Xiao
|
0deb9b4733
|
中航襄阳滑道工厂需求:新增容器编号字段
|
5 years ago |
|
王杰
|
e1783e5e46
|
pom
|
5 years ago |
|
joke.wang
|
d5b2f4a4cd
|
生产队列增加分组号字段
|
5 years ago |
|
Dominic_Xiao
|
86f9faa01d
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
Dominic_Xiao
|
7b17ecbb29
|
补全代码
|
5 years ago |
|
汪云昊
|
7f2e2189c8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
7ecbed2cda
|
fix(order):未固定单号生成长度
|
5 years ago |
|
puxiao.liao
|
ca18bb40cd
|
修复天津单据明细查询对应条码：单据条码增加行号查询条件
|
5 years ago |
许心洁
|
5e6af26b9f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
4a38aab5b6
|
任务#2989
|
5 years ago |
|
陈思洁
|
b0df747d22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
19636e308e
|
【12645 19048-喷涂质检报表用开始和结束工单查询无反应-20201123】
|
5 years ago |
wynne1005
|
d9b4a8eb4d
|
修改包扫描路径
|
5 years ago |
|
王杰
|
7be62a939b
|
TJ看板
|
5 years ago |
|
joke.wang
|
970f75f8cf
|
队列表增加分组号字段
|
5 years ago |
|
Dominic_Xiao
|
2a94ce3e0e
|
包装条码绑定解绑
|
5 years ago |
|
puxiao.liao
|
ad0325f7df
|
修复天津BUG
|
5 years ago |
|
wynne1005
|
d893e76ab4
|
merge
|
5 years ago |
|
wynne1005
|
aa450c10e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
bdf8e0d782
|
错误pojo修改
|
5 years ago |
|
Dominic_Xiao
|
167b0dad0c
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
puxiao.liao
|
46cc056a43
|
修复天津BUG
|
5 years ago |
|
simon
|
55188db083
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
simon
|
e0ee86ab73
|
删除mes-pcn包，后续引入类以mes包为准
|
5 years ago |
|
钮海涛
|
af732b7a4f
|
合并test代码
|
5 years ago |
|
许心洁
|
6005e2ab66
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
许心洁
|
7aa7738a59
|
BUG#12600
|
5 years ago |
duan.yang
|
a38be26538
|
采购订单表-主表添加同步标识、接口映射方向类型添加
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
宋双双
|
b188123ab4
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Dominic_Xiao
|
fd7799b943
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
陈思洁
|
2e1cc32ffb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
0bcb009383
|
【2977 11 2.5.5 整形业务，单件翻包与整箱过站】
|
5 years ago |
|
钮海涛
|
d9bcdca66a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
eb14a581b9
|
坤泰生成包装任务
|
5 years ago |
|
duan.yang
|
802d5d2320
|
采购订单表-主表添加同步标识
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
|
duan.yang
|
787629581f
|
接口映射方向类型添加SWEB2SAP
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
|
许心洁
|
c1e3b01524
|
BUG#12504
|
5 years ago |
|
puxiao.liao
|
9b70e3c7bf
|
fifo 推荐过滤条码
|
5 years ago |
|
joke.wang
|
2f56f8949e
|
eol看板优化
|
5 years ago |
|
Dominic_Xiao
|
20999fd63a
|
新增不良品处理查询位置列表
|
5 years ago |
|
许心洁
|
6a95335e0f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
ee37d6f5eb
|
任务#12597
|
5 years ago |
|
陈思洁
|
95c63fb30b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6ffec48185
|
【2977 11 2.5.5 整形业务，单件翻包与整箱过站】
|
5 years ago |
|
王杰
|
fa3bb1f53a
|
涂装 看板
|
5 years ago |
|
钮海涛
|
8cd41d322a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
36130d12f2
|
新增供应商退货业务类型
|
5 years ago |
|
许心洁
|
c04895784a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
c679e7f19b
|
半成品看板优化
|
5 years ago |
|
许心洁
|
a604e70771
|
BUG#12711
|
5 years ago |
|
许心洁
|
3ebcfd21e7
|
BUG#12711,12509
|
5 years ago |
|
王杰
|
cf9d3d9f2d
|
tz 看板
|
5 years ago |
|
puxiao.liao
|
21cfe5c740
|
Fix bug#12004
19058-KT其他出库用例
|
5 years ago |
|
rock.yu
|
70f659593b
|
通用接口增加 cron 表达式的支持
|
5 years ago |
|
许心洁
|
be272fd12e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2d47eeb84d
|
BUG#12487
|
5 years ago |
|
钮海涛
|
12edbb64d5
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
6fe792f75b
|
posn新增供应商生产批次字段
|
5 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
钮海涛
|
3bad341970
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
5cea79571b
|
PO订单查看按创建时间倒叙排序
|
5 years ago |
|
许心洁
|
49fb55bb42
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
66de2c1cbb
|
任务#2965
|
5 years ago |
|
joke.wang
|
f6260cec39
|
看板产线基础页面
|
5 years ago |
|
陈思洁
|
22ec710d78
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
|
陈思洁
|
4311fef1a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
be8d655eb9
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
|
王杰
|
a5935b59eb
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
a6ca2b35d3
|
修复北京特殊领料
|
5 years ago |
|
puxiao.liao
|
5f73b892ba
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
81543e3697
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
4392b513f7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
4757408a3b
|
任务#2965
|
5 years ago |
|
王杰
|
59f916ddab
|
produceSn
|
5 years ago |
|
钮海涛
|
7381ac2ca0
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
bf51e5bb7a
|
修改登录平台为固定密码
|
5 years ago |
|
puxiao.liao
|
d4eef85177
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
0fee0dbe67
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6c04caf728
|
【天津看板问题修复】
|
5 years ago |
|
puxiao.liao
|
d153205ead
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
simon
|
5b2bbf7b1e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
c03446866a
|
中航-首检单历史记录显示与修改
|
5 years ago |
|
puxiao.liao
|
9d7ae4a90f
|
修复北京特殊领料
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
钮海涛
|
4ec6267b4e
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
89a45d326b
|
合并test代码
|
5 years ago |
|
钮海涛
|
f63813d66d
|
合并master代码
|
5 years ago |
|
钮海涛
|
ceebe541f2
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
joke.wang
|
0009db6b33
|
工位技能查询bug修复
|
5 years ago |
|
joke.wang
|
7a33df666b
|
JSA JSP表增加索引
|
5 years ago |
|
joke.wang
|
148ef03e78
|
看板产线员工能力矩阵
|
5 years ago |
|
puxiao.liao
|
e250883f22
|
Fix bug#12004
19058-KT其他出库用例
|
5 years ago |
|
王杰
|
e2d6b573f0
|
不良记录报表 报工报表
|
5 years ago |
|
王杰
|
3636b75780
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
joke.wang
|
e21e49ae93
|
不良处理增加展示字段
|
5 years ago |
|
simon
|
0b68fdbee3
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
joke.wang
|
445f6b309c
|
备件消耗替代增加查询字段
|
5 years ago |
|
Dominic_Xiao
|
8e3943b306
|
Merge remote-tracking branch 'remotes/origin/test' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java
|
5 years ago |
|
王杰
|
c615475dee
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
simon
|
52974a9633
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
d3bcf1499e
|
去掉新增字段非空校验
|
5 years ago |
|
许心洁
|
0f5ab7b144
|
BUG#12609
|
5 years ago |
|
Dominic_Xiao
|
183d976c38
|
新增卡斯马展示组件模型
|
5 years ago |
|
Dominic_Xiao
|
27d76d86ae
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
a0776b7401
|
更新卡斯马展示组件,新增展示组件模型
|
5 years ago |
|
许心洁
|
79ee6eb901
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
359e085aac
|
BUG#12430
|
5 years ago |
|
陈思洁
|
92b395ad3f
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
陈思洁
|
88376bb350
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
陈思洁
|
ddc00a617b
|
【冲突】
|
5 years ago |
|
陈思洁
|
2de0d76af3
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
许心洁
|
063ba20f74
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
8e5c2f4b00
|
BUG#12170,12417,12166,12437,12452
|
5 years ago |
|
王杰
|
08fc0b54c6
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
joke.wang
|
22411fa928
|
备件导入增加列
|
5 years ago |
|
汪云昊
|
f2180f18f3
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
378205ef61
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
cc947c08f5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
8f899f2f46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
王杰
|
b7e2ddd2c2
|
包装明细 增加索引
|
5 years ago |
|
simon
|
faad8cf4c8
|
修复取消必填字段
|
5 years ago |
|
汪云昊
|
fdec58c92a
|
feat(form):表单导入功能支持
|
5 years ago |
|
钮海涛
|
4dd875a691
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
156b515497
|
修复SWEB问题
|
5 years ago |
|
joke.wang
|
1f306924e4
|
看板自定义参数页面
|
5 years ago |
|
宋双双
|
42feb06058
|
删除 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage'
|
5 years ago |
|
simon
|
d8409c5b57
|
修改文件格式
|
5 years ago |
|
Dominic_Xiao
|
22a88a4dc0
|
卡斯马定时同步实体类
|
5 years ago |
|
Dominic_Xiao
|
452024abf6
|
删除多余类
|
5 years ago |
|
Dominic_Xiao
|
13bd15d997
|
回滚PCN实体类
|
5 years ago |
|
Dominic_Xiao
|
d8c52a0534
|
新增导包
|
5 years ago |
|
Dominic_Xiao
|
f551ede492
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
Dominic_Xiao
|
61638c391a
|
包装详情表新增容器位置字段
|
5 years ago |
|
Dominic_Xiao
|
785e8dbfe8
|
包装详情表新增容器位置字段
|
5 years ago |
|
Dominic_Xiao
|
f1fedb53f4
|
增加卡斯马业务pojo
|
5 years ago |
|
Dominic_Xiao
|
eb7ed898df
|
增加卡斯马业务pojo
|
5 years ago |
|
Dominic_Xiao
|
8d0e2b942b
|
增加卡斯马业务pojo
|
5 years ago |
|
钮海涛
|
e9ec997e05
|
Fix Bug #12413 查询库存条码错误
|
5 years ago |
|
puxiao.liao
|
dc3e344f11
|
Fix bug#12401
19048-发运单支持关联多个470单据号
|
5 years ago |
|
Dominic_Xiao
|
e919987d68
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
simon
|
7d451dc136
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
joke.wang
|
928c643031
|
看板自定义参数
|
5 years ago |
|
许心洁
|
4300201f99
|
BUG#12430,12495
|
5 years ago |
|
simon
|
4c1add6ba4
|
修改中文描述
|
5 years ago |
|
许心洁
|
a5c78ae005
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
cbd0b1f136
|
BUG#12496
|
5 years ago |
|
王杰
|
fa01ec478a
|
Mes_Package 表加索引
|
5 years ago |
|
许心洁
|
e59f67e84b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
钮海涛
|
1842d1de7c
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
e3e4e1fc84
|
修复坤泰问题
|
5 years ago |
|
joke.wang
|
058bd05b4a
|
mgn-bj esop展示组件优化
|
5 years ago |
|
陈思洁
|
14f9dbed22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
c6a3428cbe
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
12391 19048-条码补打(包装)增加关联批次查询条件-20201112
开线管控问题
|
5 years ago |
|
许心洁
|
ecdc5888a4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
e5aefee838
|
BUG#12166
|
5 years ago |
|
Dominic_Xiao
|
de51b68790
|
新增表:产品缺陷位置
|
5 years ago |
|
Dominic_Xiao
|
395039e901
|
新增三个字段
|
5 years ago |
|
Dominic_Xiao
|
31a1c64f69
|
新增字段:缺陷位置代码
|
5 years ago |
宋军超
|
84986eb644
|
添加天津报工报表
|
5 years ago |
|
simon
|
cea2d334e3
|
中航-修复公差上线和公差下线赋值问题
|
5 years ago |
|
Dominic_Xiao
|
ea1d51f32c
|
删除无用类
|
5 years ago |
|
Dominic_Xiao
|
5780306e94
|
增加序列化
|
5 years ago |
|
汪云昊
|
3af9790a9e
|
refactor(impp):调整描述注解
|
5 years ago |
|
汪云昊
|
206e5f8d20
|
feat(form):支持导入数据
|
5 years ago |
|
puxiao.liao
|
89bf22521a
|
Fix bug#12380
19048-支持批量下发BOM的功能
|
5 years ago |
|
王杰
|
86998e109e
|
总装 质量判定
|
5 years ago |
|
puxiao.liao
|
5f6a7c9a98
|
Fix bug#12380
19048-支持批量下发BOM的功能
|
5 years ago |
|
陈思洁
|
ad70d8f1a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
fddd66796b
|
【12276 20027-PCN端 - 巡检检验- 系统生成巡检任务单时没有按照通知计划里面维护的时间去生成巡检任务 -20201105】
|
5 years ago |
|
宋军超
|
315d92f5c0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
7b6b97c1b7
|
修改天津涂装质量检测看板
|
5 years ago |
|
许心洁
|
2d9521e412
|
BUG#12166
|
5 years ago |
|
puxiao.liao
|
7b8597dde4
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
b124db3383
|
天津麦格纳看板BUG修复
|
5 years ago |
|
rock.yu
|
f87e4004fb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
d226c27c2b
|
邮件推送增加获取附件的脚本功能
增加发送附件功能
|
5 years ago |
|
simon
|
173e145c56
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
a1dd0fa36b
|
中航-新增查询质检单检测历史接口
|
5 years ago |
|
宋军超
|
5f9d597943
|
修改天津看板评定项字段DEC->DECEMBER
|
5 years ago |
|
simon
|
e1e0c12344
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
30382c5585
|
中航-公差上线 公差下线字段调整
|
5 years ago |
|
puxiao.liao
|
c6031c2f28
|
天津麦格纳看板BUG修复
|
5 years ago |
|
rock.yu
|
65b26a0696
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
a300e6e2f8
|
idoc 记录表增加 erp 状态字段
|
5 years ago |
|
宋军超
|
2df948207c
|
修改天津涂装看板
|
5 years ago |
|
joke.wang
|
e18b6c727e
|
mgn-bj强制封箱完成后重置数据
|
5 years ago |
|
Dominic_Xiao
|
46c0206d6a
|
卡斯马热处理翻包新增模块的dao
|
5 years ago |
|
simon
|
915b86973d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
1ba56bc59a
|
调整过程检验返回结果
|
5 years ago |
|
Dominic_Xiao
|
c2f9937b37
|
新增卡斯马热处理翻包基础模块
|
5 years ago |
|
Dominic_Xiao
|
7bb60b8f6e
|
新增卡斯马三个基础模块的查询条件封装
|
5 years ago |
|
Dominic_Xiao
|
7bb8c5cb35
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
07cd3de33f
|
新增容器位置编号字段
|
5 years ago |
|
puxiao.liao
|
7ec1bc61b0
|
天津麦格纳看板BUG修复
|
5 years ago |
|
simon
|
a6064a9a19
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
755d66dbce
|
中航-停线时根据工单删除当前“巡检项生成明细表”
|
5 years ago |
|
puxiao.liao
|
71e70e9a94
|
天津麦格纳看板BUG修复
|
5 years ago |
|
rock.yu
|
510845c185
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
d41d14b112
|
增加 erp doc no 字段
|
5 years ago |
|
许心洁
|
97341bab27
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
7dba4e7f32
|
BUG#12166
|
5 years ago |
|
许心洁
|
4d5ffce7ac
|
任务#2933
|
5 years ago |
|
汪云昊
|
f2a6ddd55a
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
426a6f2026
|
feat(ftp):ftp重试功能
|
5 years ago |
|
陈思洁
|
2911abf193
|
【12324 20027-PCN端-工单管理-产线管控已经停线，但是在工单管理中点击暂停无法成功提示“90003:工单【1545】需要在停线时才允许暂停[请检查]”-20201109】
|
5 years ago |
|
宋军超
|
5568a8fa47
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
39da900ae1
|
添加天津涂装看板
|
5 years ago |
|
汪云昊
|
7a6137a667
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
26e1b39119
|
feat(core):邮件支持附件发送
|
5 years ago |
|
宋军超
|
12074e24a8
|
添加天津涂装看板
|
5 years ago |
|
wynne1005
|
5070fcc8fb
|
天津看板 员工矩阵model 新增领导
|
5 years ago |
|
宋军超
|
e19d53de4a
|
添加天津涂装看板
|
5 years ago |
|
宋军超
|
9aeecbac39
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
98fa35c8a0
|
添加天津涂装看板
|
5 years ago |
|
puxiao.liao
|
679ef67457
|
天津麦格纳看板BUG修复
|
5 years ago |
Aisiyu
|
79161c6703
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
303fe5907d
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
rock.yu
|
7162664b79
|
通用接口增加SID记录
|
5 years ago |
|
rock.yu
|
bc3e94923f
|
增加数据源的类型
|
5 years ago |
|
Aisiyu
|
a2a4a85312
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
1680314d49
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
puxiao.liao
|
274191aee2
|
天津麦格纳看板BUG修复
|
5 years ago |
|
许心洁
|
82dc8eafbb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
3a5e446e90
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
b318abb4b8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
77d8aa4bdd
|
修改天津工单拉动逻辑
|
5 years ago |
|
Aisiyu
|
2ca398468f
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
许心洁
|
29a5d01620
|
BUG#2938
|
5 years ago |
|
puxiao.liao
|
c0d52b93f7
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
cd2076d66a
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
08011a5722
|
天津麦格纳看板BUG修复
|
5 years ago |
|
joke.wang
|
ae1bb43764
|
mgn-bj edi删除多余项
|
5 years ago |
|
Aisiyu
|
128f97c88b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
0ea3354b70
|
[1211 天津麦格纳货运看板和asn看板时间和count ]
|
5 years ago |
|
宋军超
|
6aeb6bddde
|
添加天津涂装看板
|
5 years ago |
|
汪云昊
|
8d66424bf6
|
fix(form):分页错误
|
5 years ago |
|
汪云昊
|
2121124f4b
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
faf9bd4b14
|
fix(form):分页失效
|
5 years ago |
|
汪云昊
|
3b1c068290
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
eb9e520d76
|
fix(form):分页失效
|
5 years ago |
|
puxiao.liao
|
85d2f03b55
|
修复麦格纳BUG
|
5 years ago |
|
陈思洁
|
a9e8b7b010
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
0be2231995
|
【12238 19073-安灯报表-通知记录-工作中心查询条件失效】
|
5 years ago |
|
王杰
|
e775db87fa
|
紧急插单
|
5 years ago |
|
wynne1005
|
9e204224f0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
48c1d2c1c8
|
feat(tj) 文件上传
|
5 years ago |
|
许心洁
|
d1fb133839
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
346a5088ff
|
BUG#12231
|
5 years ago |
|
Aisiyu
|
d1c0a6ce8d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
d819821234
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
宋军超
|
9bf8018ac1
|
添加天津涂装看板
|
5 years ago |
|
宋军超
|
06c3992b98
|
添加天津涂装看板
|
5 years ago |
|
Aisiyu
|
be7f6a4a92
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
陈思洁
|
26f075233e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
48a678cc16
|
【12116 19048-工位监控-参数中选择插入条码，依旧提示过程条码在系统中不存在-20201030】
|
5 years ago |
|
宋军超
|
2f81a0f35d
|
添加天津涂装看板
|
5 years ago |
|
puxiao.liao
|
67419496cb
|
修复天津麦格纳BUG
|
5 years ago |
|
陈思洁
|
250d2fbf14
|
【2932 11 2.3.3QMES产品追溯报表】
|
5 years ago |
|
wynne1005
|
8a648eab74
|
新增mysql连接时区
|
5 years ago |
|
simon
|
ece1ca4c01
|
调整中航看板返回，修复中航pcn原材料上线bug
|
5 years ago |
|
王杰
|
b9fef07d7f
|
总装质量判定
|
5 years ago |
|
王杰
|
12224ed8df
|
工单表加索引 ：workCenterCode workOrderStatus
|
5 years ago |
|
wynne1005
|
c118aac425
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
a2cf356516
|
修改mysql驱动版本 兼容mysql8
|
5 years ago |
|
王杰
|
46c22020bd
|
总装 质量判定缺陷增加类型代码
|
5 years ago |
|
陈思洁
|
1ab0225f9c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
c0abb5f994
|
【12077 19048-注塑，喷涂，组装计划生产报表导出无扩展字段内容-20201026】
|
5 years ago |
|
Aisiyu
|
6b9fcb2da9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
ab0b8a2af1
|
[1211 天津麦格纳货运看板sql 修改 ]
|
5 years ago |
|
汪云昊
|
1825cfbdf3
|
revert(pojo):还原pom版本
|
5 years ago |
|
puxiao.liao
|
a844a4d59b
|
天津麦格纳修复BUG
|
5 years ago |
|
wynne1005
|
88c942f509
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
fb5df5aedf
|
照片采集完成
|
5 years ago |
|
joke.wang
|
f38e41f1ec
|
增加看板类型
|
5 years ago |
|
宋军超
|
52c35877d8
|
添加天津涂装报表
|
5 years ago |
|
Aisiyu
|
fd08cfd883
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
28dd76f30b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
11748bb19e
|
【12066 19048-喷涂展示组件颜色查询方式变更-20201024】
|
5 years ago |
|
Aisiyu
|
219dd0ddd7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
47f464b01d
|
[1211 天津麦格纳货运看板 ]
|
5 years ago |
 曾贞一
|
143e2f1947
|
【12057 #20011-----影响流程是二维码收货和po收货和po收货，收货流程走完但是还没有提交，需要能够删除历史记录，重新操作后提交，然后不允许收货待提交的条码入库。期望解决日期2020/10/31】
|
5 years ago |
|
puxiao.liao
|
23537e76e5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
e68735be83
|
MOVE_SN 增加 left_code 属性
|
5 years ago |
|
王杰
|
ade2d60849
|
总装 质量判定
|
5 years ago |
|
王杰
|
d7092a7f52
|
总装标记不良
|
5 years ago |
|
宋军超
|
5d41023df6
|
修改天津涂装看板
|
5 years ago |
songss
|
532e99eb8b
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
76a0703bac
|
调整中航看板接口地址
|
5 years ago |
|
joke.wang
|
0d12d01ebf
|
生产报功表增加分组标识
|
5 years ago |
|
wynne1005
|
ff45755577
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
2ff6eded6e
|
修改Oee
|
5 years ago |
|
许心洁
|
08125e3b0f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
汪云昊
|
c9b4b37c23
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
687de9d828
|
feat(form):支持存储过程参数
|
5 years ago |
|
汪云昊
|
e87740e723
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
f47b699146
|
feat(form):支持存储过程参数
|
5 years ago |
|
曾贞一
|
4ee1875097
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
8d91675109
|
【12155 20145+系统参数页面，参数编码也支持模糊查询】
|
5 years ago |
|
puxiao.liao
|
e6e5982d73
|
Fix bug#12020
19058-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
joke.wang
|
63b7162932
|
mgn-bj 半成品看板
|
5 years ago |
|
汪云昊
|
dceb9b17a5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
91f68d50d4
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
91b1a67f30
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
eb03280b2d
|
doc(sql):getStringLikePack方法标记不推荐
|
5 years ago |
|
汪云昊
|
f1ab018d85
|
feat(softswitch):重试功能
|
5 years ago |
|
曾贞一
|
b979a9471c
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
Aisiyu
|
3b5cd84e6e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
曾贞一
|
e55e8b6f74
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
5e8b023fd5
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
puxiao.liao
|
762f9d4a9b
|
Fix bug#12020
19058-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
Aisiyu
|
8b94991408
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
2db034a7f8
|
[1211 天津麦格纳WMS-ASN到货看板 ]
|
5 years ago |
|
宋军超
|
692cd283f7
|
添加天津涂装看板-设备实时监控
|
5 years ago |
|
puxiao.liao
|
6269ee358c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2bc15b56ea
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
d8e5aa44bc
|
pom.xml
|
5 years ago |
|
许心洁
|
92fec185b8
|
任务#28142909
|
5 years ago |
|
陈思洁
|
8dfcb7f429
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
3dc951c34f
|
【11964 19048-喷涂抛光报表变更-20201021】
|
5 years ago |
|
曾贞一
|
9a350912ea
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
|
5 years ago |
|
曾贞一
|
5487c165ff
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
puxiao.liao
|
87611856dd
|
天津麦格纳多级BOM
|
5 years ago |
|
宋军超
|
37c95dc6b3
|
添加天津涂装看板
|
5 years ago |
|
wynne1005
|
20ee1215d2
|
解决 包名细化 导致冲突
|
5 years ago |
|
wynne1005
|
9d81ec30d1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
6d4e8608c4
|
注塑 组装报表开发完毕
|
5 years ago |
|
rock.yu
|
104fa0efa5
|
完成ERP库存差异报表
|
5 years ago |
|
joke.wang
|
f57f4e25be
|
mgn-bj 总屏看板
|
5 years ago |
|
汪云昊
|
a9520cecf7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
31cdda5b33
|
feat(softswitch):适配记录,FTP文件支持SID
|
5 years ago |
|
曾贞一
|
c9378a7d8c
|
【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】
|
5 years ago |
|
许心洁
|
38ddd82ef9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
d7bad41b29
|
天津麦格纳BUG#12111，12110，12108，12105
|
5 years ago |
|
Dominic_Xiao
|
df35a22aac
|
解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
5e1d0a75c9
|
解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
4684466e7e
|
解决BUG:19048-班次时间显示异常:修改查询的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
f57be38c2b
|
解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句
|
5 years ago |
|
puxiao.liao
|
760307910a
|
天津MGN系列BUG修复
|
5 years ago |
|
宋军超
|
1b6264e80d
|
添加天津涂装看板
|
5 years ago |
|
rock.yu
|
0fb04b8370
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
rock.yu
|
3ad59884a8
|
增加计算工单的提前时间属性
|
5 years ago |
|
songss
|
2ed5108699
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
36928196c1
|
中航看板-调整返回接口参数
|
5 years ago |
|
rock.yu
|
330cede03e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
b6a309bacf
|
增加 ERP 对账数据表
|
5 years ago |
|
puxiao.liao
|
023811d0fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
6f239ee756
|
Fix bug#12019
12019-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
joke.wang
|
5227540ecc
|
队列表添加索引
|
5 years ago |
|
许心洁
|
586365dc69
|
任务#2893,#2894,#2901
|
5 years ago |
|
陈思洁
|
4e013a7ef0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6fcf32aa80
|
【2890 10 2.3.8安灯作业优化】
|
5 years ago |
|
songss
|
e0d315a1f8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
d9040143f9
|
新增中航产线看板-每小时产量接口
|
5 years ago |
|
puxiao.liao
|
24acb86dff
|
实时库存查询&导出优化
|
5 years ago |
|
钮海涛
|
2b4ff2300d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
582ef23ca3
|
修复SWEB问题
|
5 years ago |
|
wynne1005
|
1730dc27c3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4d4ad7ff84
|
天津注塑看板
|
5 years ago |
|
puxiao.liao
|
62d5d62cef
|
北京MGN系列BUG修复
|
5 years ago |
|
songss
|
95936d40fe
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
783022646c
|
新增中航产线状态图接口
|
5 years ago |
|
rock.yu
|
a953523245
|
增加 ERP 快照相关表
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
钮海涛
|
1037ad6e68
|
修复问题
|
5 years ago |
|
puxiao.liao
|
3de97d5b98
|
北京MGN系列BUG修复
|
5 years ago |
|
王杰
|
f6ad2824b2
|
11984 19048-组装生产计划报表增加字段-20201020
|
5 years ago |
|
王杰
|
7fcbf3f4e2
|
:wq
erge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
puxiao.liao
|
6907ab6dc0
|
北京麦格纳看板需求
|
5 years ago |
|
王杰
|
97be3f186a
|
工单生产时间变更定时任务实体
|
5 years ago |