袁津哲
|
df480bf11d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
36b4e67020
|
导入模板功能建模
|
5 years ago |
宋军超
|
8fe5574c67
|
part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE")
|
5 years ago |
汪云昊
|
baaf16ad56
|
国际化工具类异常处理优化
|
5 years ago |
陈思洁
|
5d8fec4938
|
合并冲突
|
5 years ago |
|
陈思洁
|
7505087392
|
【mes 产品配方导入功能和基础数据维护】
|
5 years ago |
 王杰
|
0a14b533d7
|
任务1659 返工返修
|
5 years ago |
|
袁津哲
|
ec1d8a2ff3
|
开发导入模板功能
|
5 years ago |
 钮海涛
|
b25ff3cbba
|
bug:8137
|
5 years ago |
 曾贞一
|
9102a3691b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
10fc6ded8d
|
【1558 生产工单管理-泰国需求】
|
5 years ago |
joke.wang
|
280385eb20
|
[bug: 8092 SOP信息需求变更]
|
5 years ago |
|
joke.wang
|
54ff0deb87
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
5 years ago |
|
宋军超
|
e464b4d699
|
删除设备备件管理相关实体
|
5 years ago |
|
宋军超
|
38fa894817
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
89a9946432
|
添加设备管理相关功能
|
5 years ago |
|
钮海涛
|
100d8b0019
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
c75a25b854
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
bd810c1c8c
|
task:1591
|
5 years ago |
|
joke.wang
|
b17cf60ac6
|
[任务：1571 生成报功数据 需求变更]
|
5 years ago |
|
王杰
|
cba7ee3d0d
|
[任务：1522，ptl流程设计]
|
5 years ago |
qianhs
|
88279f9b8b
|
sonar bug修改
|
5 years ago |
|
曾贞一
|
e5c275499c
|
【冲突解决】
|
5 years ago |
|
曾贞一
|
255aefbcef
|
【1585 销售订单管理-销售订单维护】
|
5 years ago |
|
钮海涛
|
e64134a821
|
修复合并问题
|
5 years ago |
|
钮海涛
|
e9ec4cecfe
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
00fce0bded
|
新增客户物料发往地
|
5 years ago |
wynne1005
|
0e934f9af6
|
task `1565` 发运enum
|
5 years ago |
|
wynne1005
|
81f05c233a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
93622f5dc7
|
中航 开线管控 提交
|
5 years ago |
|
汪云昊
|
f09159dffa
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
34c77d6944
|
ICS 注册中心监控接口，Actuator对外端口调整
|
5 years ago |
puxiao.liao
|
a2f7c3426e
|
bug7994【7994 麦格纳收货需求差异】
|
5 years ago |
|
钮海涛
|
01d3eeea51
|
新增客户物料发往地
|
5 years ago |
|
钮海涛
|
16f6861ecd
|
新增窗口时间
|
5 years ago |
|
宋军超
|
aac4e24113
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
b02d7372f6
|
添加散件bom批量导入功能
|
5 years ago |
|
joke.wang
|
9e0fbef169
|
[按钮组件代码优化]
|
5 years ago |
|
钮海涛
|
dd9ae231c8
|
与界面联调物料扩展属性
|
5 years ago |
|
wynne1005
|
48f94c0369
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
cc739eac24
|
task `1565` 发运pojo
|
5 years ago |
|
钮海涛
|
331fb73d28
|
新增供应商维护基础数据
|
5 years ago |
|
joke.wang
|
99e055da3c
|
[现场问题：111 检测项报表]
|
5 years ago |
|
袁津哲
|
30610476b9
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
1caea6bf36
|
修改实体数字字段
|
5 years ago |
|
qianhs
|
214fbb8da2
|
【1613 装车单新增中航打印格式】
|
5 years ago |
|
袁津哲
|
d289a58439
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
db7d86acc1
|
修改实体数字字段默认值0，不允许为空
|
5 years ago |
|
wynne1005
|
035e77c0ab
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
5d6588b5af
|
task `1565` 增加发运字段
|
5 years ago |
|
陈思洁
|
03d2ee9246
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
244270684d
|
【泰国项目】
|
5 years ago |
|
袁津哲
|
a5a8130388
|
修改不兼容sqlserver数据库查询语句
|
5 years ago |
|
wynne1005
|
86713a01f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
1051b22575
|
ICS 注册中心监控对象
|
5 years ago |
|
joke.wang
|
4469d92344
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
f1baf4fdbe
|
[麦格纳问题：111 检测项报表]
|
5 years ago |
|
宋军超
|
8109275630
|
添加散件BOM导入
|
5 years ago |
|
宋军超
|
69b620336f
|
散件BOM导入
|
5 years ago |
|
wynne1005
|
15c9e7111b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
qianhs
|
ca85c59cdb
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
qianhs
|
20f5bfc9eb
|
wms数据同步迁移至mes
|
5 years ago |
|
陈思洁
|
72563a4eb5
|
【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】
|
5 years ago |
|
王杰
|
c6aefc89e7
|
test合并dev解决ct
|
5 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
5 years ago |
|
陈思洁
|
59cbfbf293
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
08ec98305b
|
【1581 工位扫描-记录换模时间 -校验逻辑调整】
|
5 years ago |
|
joke.wang
|
3e33a7ac3a
|
[客户jit增加JIT排序号字段]
|
5 years ago |
|
王杰
|
b1018dbd39
|
[平台；]
|
5 years ago |
|
袁津哲
|
1a74363541
|
优化实体字段
|
5 years ago |
|
puxiao.liao
|
4b3923a64d
|
bug8056【8056 car_no,driver_no这两个字段没有写在事务表中，导致wms_move_to_erp中没有】
|
5 years ago |
|
wynne1005
|
b5ecb91399
|
中航四月十号 内容提交
|
5 years ago |
|
joke.wang
|
4e8c4ae46f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
caf8feb374
|
[采集工步存入生产数据格式修改]
|
5 years ago |
|
joke.wang
|
11adb5ff09
|
[麦格纳问题：111 检测项数据报表]
|
5 years ago |
|
钮海涛
|
05c1575e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
01ae9caa8c
|
task:1496
|
5 years ago |
alwaysfrin
|
f4e9a80d79
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
alwaysfrin
|
14660641ba
|
hibernate优化
|
5 years ago |
wei.peng
|
fa42a25b96
|
异常处理优化
|
5 years ago |
|
puxiao.liao
|
63c827d0de
|
bug8050【8050 运输规则配置页面--新增成功，数据库有数据，但是页面不显示】
|
5 years ago |
|
joke.wang
|
1d50c135ac
|
[麦格纳问题：87 增加工单管理页面]
|
5 years ago |
|
wei.peng
|
aa1f7a2845
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
曾贞一
|
3bea17f2d7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
b7e3aeef41
|
【8014 20011--报工记录表，查询数据重复---0415】
【8015 20011--报工记录报表，增加两列显示】
|
5 years ago |
|
钮海涛
|
4dee474c73
|
修改POM版本号
|
5 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
5 years ago |
|
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
cd810ce1fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
5a6c525d1f
|
【MES_生成条码模型增加时分秒字段】
|
5 years ago |
|
王杰
|
e0a23b147e
|
mes enum
|
5 years ago |
|
王杰
|
3f3d0038e8
|
【任务：1608 数据监听预警配置，定时任务】
|
5 years ago |
|
qianhs
|
2e85d99380
|
联调测试
|
5 years ago |
|
wynne1005
|
dbba31670d
|
增加条码生产
|
5 years ago |
许心洁
|
4884f59072
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2bc62e2444
|
动态查询：#需求变更 创建用户和更新用户也需要做成可选的
|
5 years ago |
|
wynne1005
|
17f6ac6609
|
删除重复字段
|
5 years ago |
|
wynne1005
|
07d8e12216
|
commit stationrequestbean
|
5 years ago |
|
wynne1005
|
2e177ba671
|
dev合并test test有修改
|
5 years ago |
|
汪云昊
|
2772ea6a2f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-ptl/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
5 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
5 years ago |
|
wynne1005
|
763d72b128
|
dev合并麦格纳的test
|
5 years ago |
|
puxiao.liao
|
b8701bc398
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
7062e7a383
|
bug7935【7935 二维码收货-供应商批次格式-校验不通过系统异常】
|
5 years ago |
|
joke.wang
|
14bb71f9f2
|
[料架条码打印查询修改]
|
5 years ago |
|
wynne1005
|
581d900123
|
状态机model提交
|
5 years ago |
|
qianhs
|
ba4b450437
|
联调测试
|
5 years ago |
|
wynne1005
|
12e31f630b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
ba90a50621
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
qianhs
|
8c635c3557
|
联调测试
|
5 years ago |
|
qianhs
|
7244fb38b1
|
联调测试
|
5 years ago |
|
wynne1005
|
f8e0f5e37e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
e289414363
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
46e0f502d0
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
|
曾贞一
|
a59a5e532e
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
|
曾贞一
|
35023af12c
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
|
汪云昊
|
e7d176209e
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
64d83d238f
|
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
b4f14112b3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
5 years ago |
|
袁津哲
|
94f25541aa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
4dc2996bdc
|
业务类型实体中新增是否启用波次字段
|
5 years ago |
|
宋军超
|
b3032ca8e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
45dda6ea57
|
添加散件配置报文关系和工装明细实体
|
5 years ago |
|
袁津哲
|
cbe3094f2a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
ea9457a191
|
修复WMS波次计划实体类字段
|
5 years ago |
|
钮海涛
|
cfd3f8d58f
|
冲突解决
|
5 years ago |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
5 years ago |
|
陈思洁
|
30608f886b
|
解决冲突
|
5 years ago |
|
陈思洁
|
d9d2113f75
|
【MES_增加枚举】
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
钮海涛
|
53dc57a03e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
df1cbc9449
|
新增供货追踪接口
|
5 years ago |
|
qianhs
|
836a4f710d
|
联调测试
|
5 years ago |
|
宋军超
|
b3cecc9481
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
f64a543a4a
|
添加产品流程批量配置功能
|
5 years ago |
|
袁津哲
|
bcec12cb38
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
3442fd4801
|
波次规则明细新增开窗查询字段
|
5 years ago |
|
袁津哲
|
9f918b6664
|
修改波次规则和范围枚举类字段值名称
|
5 years ago |
|
王杰
|
cd99a63233
|
mes
|
5 years ago |
|
汪云昊
|
0d75c1eac7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
wynne1005
|
032fb350c8
|
queueordermodel添加构造函数
|
5 years ago |
|
曾贞一
|
57f2177ef6
|
【波次合并规则--枚举查询错误】
|
5 years ago |
|
袁津哲
|
ae1c6ef8fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
8a836e340a
|
优化枚举查询报错问题
|
5 years ago |
|
puxiao.liao
|
d2fb33d888
|
bug1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 years ago |
|
puxiao.liao
|
053e81b861
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
a432b77ca0
|
任务1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 years ago |