钮海涛
9e0158e749
修改test分支POM配置
5 years ago
c90df4e96a
Jenkins自动合并
5 years ago
28ce8615fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
51d60a107a
SAP指令锁定逻辑修改：
...
根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表；
原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；
5 years ago
f927ee21ac
Jenkins自动合并
5 years ago
王杰
bf71cd07d0
JIS发运
5 years ago
134757c92b
Jenkins自动合并
5 years ago
32d715a29c
APS 调用失败bug 修复
...
动态报表 下拉问题修复
5 years ago
964afe73cd
2020-01-16 16:42 添加自定义列枚举
5 years ago
851067b8d2
2020-01-16 16:37 自定义列表优化
5 years ago
d790bcf355
Jenkins自动合并
5 years ago
67ef5c5516
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
89a7cafee4
Wms动态搜索与自定义列表，表单开发
5 years ago
33e68b7e9f
Jenkins自动合并
5 years ago
cb68f62e46
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
8a4974f369
自定义报表 调用调整
5 years ago
6371e8df60
Jenkins自动合并
5 years ago
f7c98e3982
Wms动态搜索与自定义列表，表单开发
5 years ago
69ff58a67e
Jenkins自动合并
5 years ago
61303a9f38
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
5 years ago
002ce795f4
Jenkins自动合并
5 years ago
01a694be70
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
6baeeee71e
task `1392` 调整工步 错误处理实现
5 years ago
458137d216
Jenkins自动合并
5 years ago
fff79a7846
GROUP_COMMIT_MODE枚举漏提交
5 years ago
0e54d9a5b6
任务#1403 流程isCommitRefMove属性改为commitMode
5 years ago
c1609539cf
Jenkins自动合并
5 years ago
de0d57179c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
35839db806
BUG#7359 任务列表分组字段和移动单赋值逻辑更改
5 years ago
8f6b53c5ea
Jenkins自动合并
5 years ago
3e31641b20
PTL 项目初始化
...
PTL PCN 项目初始化
5 years ago
a0b67a3723
Jenkins自动合并
5 years ago
8285c87624
Wms动态搜索与自定义列表，表单开发
5 years ago
7057c685cc
Jenkins自动合并
5 years ago
2396863bab
【任务:1383 数据监听定时数据抓取】
5 years ago
64438ac61c
Jenkins自动合并
5 years ago
41047a17c1
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
5 years ago
8e168c5109
Jenkins自动合并
5 years ago
503f3cd7a3
自定义表单功能优化
5 years ago
曾贞一
5c841c706b
【7201 收货BOP移库流程图】
5 years ago
56e53906ec
Jenkins自动合并
5 years ago
f1096e9ec5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
51839d7be5
【任务：1381】
5 years ago
add40a27e3
【任务：1382，数据监听基础模块开发】
5 years ago
536200cf2b
Merge remote-tracking branch 'remotes/origin/dev' into test
5 years ago
cbe87c6bd7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
c14d6c6916
【宁德问题清单】
5 years ago
7d4ba10449
Wms初始化扫描实体字段新增逻辑优化
5 years ago
75dc17f4c4
Jenkins自动合并
5 years ago
d0cd9d03b9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
0d7aca73a8
【需求：7315 生产工单变更】
5 years ago
王杰
54bdf8f6a0
JIS
5 years ago
9fbc120666
动态搜索与自定义列表初始化扫描Bean字段
5 years ago
王杰
685d7949bf
Merge branch 'dev' into test
5 years ago
b84a305b26
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
497b963f60
Jenkins自动合并
5 years ago
王杰
bf62494236
JIS
5 years ago
fa4cc8610f
Jenkins自动合并
5 years ago
8584946ce5
【 条码状态报表，导出时下列三个字段为中文
...
】bug7196
5 years ago
c86f3e280e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
王杰
f88041df1e
Merge branch 'dev' into test
5 years ago
王杰
3fe50125ae
JIS
5 years ago
c226e61acf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
d9990f0cb8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
823f818abf
Merge remote-tracking branch 'remotes/origin/dev' into test
5 years ago
44af186f2f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
af6083ddff
日志存储优化
5 years ago
68eb60c6cb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
f38e54e496
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
422aa1835f
Jenkins自动合并
5 years ago
钮海涛
4013ed776b
修复炉资源排程问题
5 years ago
dfb06def2b
Jenkins自动合并
5 years ago
曾贞一
9e9d3e2afa
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
曾贞一
5a4510cedb
【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】
5 years ago
81bab75132
【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】
5 years ago
adb4bd2a1c
Merge branch 'dev' into test
5 years ago
7594b3d515
SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消
5 years ago
688d976683
Jenkins自动合并
5 years ago
王杰
8a4aa9fed2
jis发运
5 years ago
ebe34e4ba9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
ad08ff21bb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
569c2613fe
Merge branch 'dev' into test
5 years ago
f768247c4f
代码合并 2019-12-30 15:59:52
5 years ago
39790fd50b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
d47a097c53
【任务：1344 通用接口增加批量数据处理】
5 years ago
1230906c3e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
3b7b374b23
自定报表对象模型调整
5 years ago
b12f67e34b
Merge remote-tracking branch 'remotes/origin/dev' into test
5 years ago
6b02d9969a
数据源批量写入优化
5 years ago
王杰
7287aaeb77
其他组未提交的代码
5 years ago
471016b345
Jenkins自动合并
5 years ago
20ccf65c5c
资源加载优化
5 years ago
d89ed44bcc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
1d9ab80ae8
数据源适配器 - 批量写入优化
5 years ago
192034152b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
王杰
3ddadad142
Merge branch 'dev' into test
5 years ago
王杰
019cb91a4c
【需求：1329】
5 years ago
dbe2d32bb6
[需求：1322，枚举修改]
5 years ago
王杰
91ab421d5e
Merge branch 'dev' into test
5 years ago
f857a4065d
【任务：1327JIT生产】
5 years ago
e5452056b6
【bug7083 KT器具管理】新增业务类型和作业类型
5 years ago
794992d687
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
734b54d1b2
【 领料上线扫描时，在扫描完条码后将目标库位带出。
...
】bug7024
5 years ago
王杰
06afd98334
Merge branch 'dev' into test
5 years ago
0e84990f3c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
20f6961daf
【任务：1327JIT生产】
5 years ago
6a19a07fce
Jenkins自动合并
5 years ago
d5c1f7a7a3
资源模块数据
...
模板软删除
软适配list传参
5 years ago
1fbd9c4357
Jenkins自动合并
5 years ago
dccd104fdd
[需求：1324，excel导出]
5 years ago
4e8ee475b4
Jenkins自动合并
5 years ago
99eaa8b8ca
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
5 years ago
fc9b8629ab
【采购收货】
5 years ago
cc45dbc2cb
Jenkins自动合并
5 years ago
996526ac7c
【bug7088 物料信息中的导入功能】
5 years ago
王杰
90de0f7df6
Merge branch 'dev' into test
5 years ago
王杰
b0709aca97
枚举
5 years ago
王杰
ab68895760
test分支修改pom
5 years ago
王杰
c87b00756f
dev分支修改pom
5 years ago
a2ac02aa47
【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】
5 years ago
7ef04dd824
【1320 KT物料信息--需要维护物料的类型：器具】
5 years ago
a7d1ec785b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
5c28c8344c
【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】
5 years ago
4705b77a7e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
b674087ffc
资源导入优化
5 years ago
王杰
339f1a86c2
删除枚举代码中间的注释
5 years ago
0453363336
【发运配料界面显示将单据数量改为剩余配料数量。
...
】bug7063
5 years ago
e2c9d9e569
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
54fe0ce760
【bug：6360 工厂初始化】
5 years ago
49134cc5b3
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
钮海涛
81b84d86e5
新增KPI接口
5 years ago
0191a17a4d
Merge branch 'dev' into test
5 years ago
0103c64247
task `1316` 1 拆分job任务
5 years ago
e206057aba
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
5513e95884
Jenkins自动合并
5 years ago
01e5919349
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
b5006a88f1
【#1302 器具管理-新增器具规则检查组件】【#1303 器具管理-修改更新箱条码组件】
5 years ago
50f77a5081
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
0e1599789d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
d92850c1a4
【运输管理】
5 years ago
a38dc051ac
task `1308` 1 PCN国际化资源
5 years ago
03051f4fd1
Jenkins自动合并
5 years ago
773f56b577
TASK_INO_STATUS 20和30的枚举类名严重错误，容易误导开发
5 years ago
1318c6ef56
Merge remote-tracking branch 'remotes/origin/dev' into test
5 years ago
129c84d4a8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
bc21d0b461
task `1308` 1 PCN国际化资源
5 years ago
5d4e8a94c4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
c5ae91b41e
【KT-1286 计划拉动-计划拉动JOB】
5 years ago
55dcb795c9
Jenkins自动合并
5 years ago
e816c2fd6a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
258c1ccbe8
流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库
5 years ago
1594c49ca9
Jenkins自动合并
5 years ago
f23b0f7bfe
解决冲突
5 years ago
3e9c1aaa76
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
7451bc9460
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into wynne_temp_wc
6 years ago
99fd4221e2
task `1304` 1 活化开线管控
6 years ago
350f7101d2
Jenkins自动合并
6 years ago
f3756e6b34
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b9b30cf19c
【任务：1306质量标准配置】
6 years ago
b3a04911b6
task `1300` 5 BI 产线运行情况
6 years ago
5393d6e034
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
586dfb416b
[mes枚举修改]
6 years ago
40c64db0b1
冲突
6 years ago
ee14ce1d4b
【KT-快速入库功能】
6 years ago
015d284239
Jenkins自动合并
6 years ago
99a1ec309d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3bfb0995d5
【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位
...
】bug1299
6 years ago
王杰
c4c615bd15
Merge branch 'dev' into test
6 years ago
王杰
3ff9fbc140
安灯图表
6 years ago
b088b40fd1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
a1a602e457
task `1300` 5 BI 产线运行情况
6 years ago
6995189893
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
46ec9e51b0
【任务：1211报表导出冗余字段】
6 years ago
874fd139dc
Merge branch 'dev' into test
6 years ago
59bdec9c6f
【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举
6 years ago
ef34a13313
task `1300` 2 BI 产线运行情况
6 years ago
e3d84dd48f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
b2daf9fd9c
task `1300` 1 BI 产线运行情况
6 years ago
d6975bf5de
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ccfba0fe56
mes枚举修改
6 years ago
0dfb948810
Merge branch 'dev' into test
6 years ago
519d985838
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0acf17ddd7
【1211：报表1】
6 years ago
927579aca5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fc663ee283
作业流程导入导出BUG#6189
6 years ago
a6bb80a5a4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2e98e17a05
【运输管理】
6 years ago
7016f20282
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7bf8534c16
mes枚举
6 years ago
03d432993a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
47fb080742
lac线程超时监控优化
...
Session超时时间参数化
lac添加TaskCheck
日志添加索引
6 years ago
7d07580a78
合并冲突
6 years ago
b9844c255b
生产计划表结构增加
6 years ago
3e6ca8d039
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
a1a3d1e838
【Bug清单】------------------------------
6 years ago
c7d4253e5e
【bug 6872 - 收货、发运看板数据未加载】
6 years ago
王杰
1f4a8d6e55
【安灯修改枚举】
6 years ago
a337f1824f
Merge branch 'dev' into test
6 years ago
32dccc056c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
6 years ago
1e10bdee0c
【坤泰运输管理】
6 years ago
fc5282342f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ca952d5211
bug`6866` 2 打印模板同步
6 years ago
056dbaacf2
Merge branch 'dev' into test
6 years ago
王杰
fcc2b09559
【安灯修改枚举】
6 years ago
f4b50200b2
bug`6866` 1 打印模板同步
6 years ago
032260b9f2
[需求：1290，导入excel]
6 years ago
曾贞一
10d8b9626f
冲突解决
6 years ago
曾贞一
cb6fe137d1
【bug6863 生产入库时-如果判断该条码未报工】
6 years ago
49a126843b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4fd9ec76f4
枚举漏提交
6 years ago
钮海涛
57b3b4242e
新增表达式录入界面接口
6 years ago
王杰
91730dd195
【需求：1277，关闭，暂停，完成工单 需要停线，做到方法可配】
6 years ago
d835ef1bb5
【任务：1273质量检测标准增加检测项类型】
6 years ago
a579358968
【任务：1257下线时间】
6 years ago
钮海涛
5e8e05ddb4
新增表达式录入界面接口
6 years ago
690918add5
Merge branch 'dev' into test
6 years ago
曾贞一
1c9f605c56
【VDA成品发运配料-客户发往地】
6 years ago
王杰
5d57bc44d8
更新 'modules/i3plus-pojo-base/pom.xml'
6 years ago
王杰
cfa54aa2b6
修改pom
6 years ago
王杰
b9906cee55
增加枚举
6 years ago
d2591b419b
Jenkins自动合并
6 years ago
e4348cd334
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fa8a88c6d0
流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中
6 years ago
93126de988
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
1d0c03ba9c
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
a35171a41d
【采购收货】
6 years ago
f9d508d1ef
Jenkins自动合并
6 years ago
402b09e82e
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
6 years ago
王杰
338367f3c3
Merge branch 'dev' into test
6 years ago
钮海涛
64bfbb5013
新增甘特图工作块连线功能
6 years ago
7630541146
Jenkins自动合并
6 years ago
0e2b13d52f
【任务：1258枚举优化】
6 years ago
王杰
52f4854621
Merge branch 'dev' into test
6 years ago
王杰
99b66e459d
【需求：1221，导入】
6 years ago
王杰
5dd94058cf
Merge branch 'dev' into test
6 years ago
王杰
f038ed7234
增加枚举
6 years ago
56381b76f1
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
db019bf4eb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d44d5d79ab
Jenkins自动合并
6 years ago
26e7f975bf
数据源适配器支持IN
6 years ago
钮海涛
0dddbb936c
新增报表接口
6 years ago
f5a0f24355
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f2c0c1206a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3faa679cf9
Job测试
...
新增资源初始化方式（导入，导出）
异常日志持久化bug
OPC服务
MQ管理接口
6 years ago
王杰
6da48220a5
Merge branch 'dev' into test
6 years ago
王杰
6959d126a0
增加枚举
6 years ago
376700de0d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
钮海涛
d4f963ee70
新增报表接口
6 years ago
74224b20ac
安灯主界面开发
6 years ago
7556ada2d4
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
9e64ee8258
【需求：1221，导入】
6 years ago
8a34eee5c5
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
a49fdf87b8
【任务：1211报表质量数据】
6 years ago
d5ff3e4ce1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
54d3e351be
合并冲突
6 years ago
5af777c4fd
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
b69bd1ae53
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ed89db8be3
6565 更新 同步流程
6 years ago
dcd36cb6e5
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
af1324e9c7
【采购收货】
6 years ago
6d5fc7ab39
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
25cbbb5837
雪花ID 生成器 改为prop 配置
6 years ago
王杰
73b1e827d6
Merge branch 'dev' into test
6 years ago
王杰
1ab2c3605a
【需求：1221，导入】
6 years ago
王杰
e9055e3c5d
Merge branch 'dev' into test
6 years ago
王杰
2893d13e9f
需求1221，导入
6 years ago
f6506bdd0b
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
曾贞一
ca6b596b14
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
47ccfcc9e3
【EU成品发运-检查数量组件】【bug1177】
...
【EU成品发运-检查单据是否操作完成组件】【bug1176】
【EU成品发运-成品发运FIFO推荐组件】【bug1174】
6 years ago
王杰
1d920627ec
Merge branch 'dev' into test
6 years ago
钮海涛
5f3f973c3e
新增报表接口
6 years ago
王杰
a41c00f129
Merge branch 'dev' into test
6 years ago
5bc9b9b082
【任务：1193字段类型修改】
6 years ago
王杰
dd0304d713
Merge branch 'dev' into test
6 years ago
3eda200854
【bug：6545类型信息增加枚举】
6 years ago
王杰
09cf450156
Merge branch 'dev' into test
6 years ago
4d3adf5daf
Merge branch 'dev' into test
6 years ago
f0e77305dd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3856a6d600
LAC调整微服务指令集操作方式
...
OPC UA工具订阅方式调整
6 years ago
f0290a758d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
e349ab3e9b
【采购收货】
6 years ago
11bc240347
功能权限国际完成
6 years ago
55ee26db3c
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f836daf8a6
将广播设备写死的代码配置化
6 years ago
62800f757e
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
185b40a586
6518 管控代码修改
6 years ago
钮海涛
bed955575d
修复规则组合关联问题
6 years ago
04ae04246e
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
07bda76d4f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b181cf2ac3
【安全库存拉动】
6 years ago
王杰
ac5432bebb
解决冲突
6 years ago
王杰
71d39f54d2
Merge branch 'dev' into test
6 years ago
王杰
c595d3f6b1
修改字段
6 years ago
d6ff7aa2b1
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
492367670b
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
59d6eb0727
添加系统配置接口
6 years ago
钮海涛
695ab094d2
修复资源表多选枚举显示问题。
6 years ago
钮海涛
89943f6586
修复资源表多选枚举显示问题。
6 years ago
7a134dc0cb
【欧洲-生产快速入库】bug6389
6 years ago
8eb8c2f97e
Merge branch 'master' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
9f9c095846
Merge branch 'dev' into test
6 years ago
c4ed0f1f37
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
12ba5d2ff3
lac微服务模式优化
6 years ago
王杰
a595fed4fe
Merge branch 'test'
6 years ago
王杰
9baac06cb7
Merge branch 'dev' into test
6 years ago
王杰
e91369c82a
【需求：1198】
6 years ago
0fad1e4df5
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
23b3ae88e5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0e9b9b26fd
包装打印逻辑修改
6 years ago
e7bad502c3
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
96ea008725
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
41a48b4b59
【采购收货】 采购收货
6 years ago
68f31721f0
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d4422bee15
【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】
6 years ago
王杰
7a023d0f4b
Merge branch 'dev' into test
6 years ago
王杰
3c3de49512
【bug:6483】
6 years ago
王杰
64d631c180
Merge branch 'test'
6 years ago
王杰
e5db689881
Merge branch 'dev' into test
6 years ago
王杰
85e35eede1
解决冲突
6 years ago
王杰
7f08847c50
Merge branch 'test'
6 years ago
王杰
6297ccc4d7
Merge branch 'dev' into test
6 years ago
5e813f30e7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f632308d0a
【任务：1193接口数据解析】
6 years ago
王杰
2a5c32b8ea
解决冲突
6 years ago
5050c0c5a1
新增实体--安全库存
6 years ago
4a76c480ac
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
6 years ago
82fd56dc68
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
fdd051f2dd
打印修复
6 years ago
王杰
1a7164c474
Merge branch 'dev' into test
6 years ago
9842ed2181
【任务：1193接口pojo】
6 years ago
5b6b303722
Merge branch 'test'
6 years ago
17d5f1e512
Merge branch 'dev' into test
6 years ago
王杰
2660e0268e
【需求：1198，代码优化】
6 years ago
410558d43c
Merge branch 'test'
6 years ago
曾贞一
7dbb55bcb0
【VDA质检】【缺了检验条码数量是否为-bug6402】
6 years ago
b5685a7874
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
6de87a1581
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9969916e0a
开口合同 -关联单据类型
6 years ago
3005beda46
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4ad645d34e
流程管家新增触发源（放大镜80）+修改流程BUG#5826#5779+查询类型为可选列表的参数时没有加上软删条件
6 years ago
王杰
9137555226
Merge branch 'dev' into test
6 years ago
钮海涛
58b0f4a531
新增BOM树信息获取接口
6 years ago
3d8421e1ec
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
c3441184c0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
6 years ago
8ff5d888c2
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
aab18be0e6
Lac细节优化
...
OPC调整
6 years ago
137e473543
【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】
6 years ago
b80a5b21ba
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bcc7c282ca
1. 增加质检单生成类型
6 years ago
王杰
093008fae8
Merge branch 'dev' into test
6 years ago
616d39fa38
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
246726a67d
【任务：1193 接口基础数据】
6 years ago
c1b50db526
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
49637cb23f
【需求:1167,批量打包】
6 years ago
d23303f07b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
60ec41e149
【采购收货】
6 years ago
a7b751d9dc
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
423d8d2c03
日志开关
...
lac优化
OPC UA工具类
6 years ago
835ea47ba2
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
a30f4aae83
andon广播音量可配置， 安灯通知记录
6 years ago
3eeaff50b3
【bug：5957工厂初始化】
6 years ago
75701682d2
【EU-生产报工撤销】【353生产报工撤销-4.1 处理报工撤销条码组件】【1191生产报工撤销-4.1 处理报工撤销条码组件】
6 years ago
838b7ac311
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
cce413945d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c1476f83c0
关闭任务
6 years ago
003ed70f98
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
b595d76056
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
45d14fe3e2
枚举增加 生产模式参数 6823
6 years ago
ed7e002f6d
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
7678b95aaa
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
a294c1ccb0
安灯看板超时统计功能
6 years ago
6536109b66
【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】
6 years ago
王杰
71bde083a3
Merge branch 'dev' into test
6 years ago
9b491b742e
业务类型枚举维护
6 years ago
60c25d7a71
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
ccb29c5903
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
王杰
f5c8e36ac9
【需求：1189，产品条码工步】
6 years ago
王杰
bcf3866ca6
Merge branch 'dev' into test
6 years ago
208410340e
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
1453a3d49b
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
6 years ago
王杰
ab34ebb769
Merge branch 'dev' into test
6 years ago
3b235acda0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
31e24390dd
合并冲突
6 years ago
c93dd66cd9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7b88c605ba
枚举修改 1060
6 years ago
99947f284e
枚举修改--移动业务类型
6 years ago
62bb71f4b0
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
6 years ago
578be0650a
Merge branch 'dev' into test
6 years ago
43e400d354
数据映射类型 更改BigDecimal
6 years ago
db952282e0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7378df1b9e
【宁德问题清单】
6 years ago
b6e27c33c8
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
a04b8f7c57
【bug：5791 生产工单明细1】
6 years ago
5fd619ac79
【bug：5791生产工单明细】
6 years ago
王杰
75e7aa30c2
Merge branch 'dev' into test
6 years ago
王杰
84bf5ba64a
【需求：1162，pcn登陆】
6 years ago
04e876250b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
58c9795b7c
移动类型、业务类型维护数据
6 years ago
王杰
acaacf63a3
Merge branch 'dev' into test
6 years ago
56e6cf7918
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
6871e96496
Merge branch 'dev' into test
6 years ago
88a69ac7f8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71c867dd8c
【包装规格】
6 years ago
ac43296df3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5dc8ffb394
日志处理队列V1.0
6 years ago
王杰
bc14fcf027
Merge branch 'dev' into test
6 years ago
eeebbfd1fe
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
759f9ee819
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
e26dadca01
【需求：1162，pcn登陆】
6 years ago
dcbb6a7a1c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
053b3ae0e4
LAC 前端联调调整
6 years ago
da582b871d
日志处理优化
6 years ago
c4d7a2380c
Merge branch 'test'
6 years ago
efbe0dfce9
Merge remote-tracking branch 'origin/dev' into test
6 years ago
fc79b1b0f3
【扫描查询】【308扫描查询-4.2增加处理查询结果组件】【1132扫描查询-4.2增加处理查询结果组件】
6 years ago
029c9b6bc8
代码审核 修改1
6 years ago
970105ac19
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
b6d7156b0b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9a6c5cfda3
【任务：1163客户订单】
6 years ago
王杰
b2886012a5
【需求id：1162，pcn登陆】
6 years ago
e433915759
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
c68cb7889e
【VDA物料拆分-输入数量-数量检验】【6233】
6 years ago
曾贞一
c2d3e044fb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
be75c4ec42
【VDA质检--物料信息维护】任务号1135
...
【VDA质检--检查数量组件--修改】任务号1134
【VDA质检--检查质检箱数组件】任务号1133
6 years ago
64be0c721c
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
4b47ceb42d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3b447fa77a
数据抽取修改 1130
6 years ago
9418a0838b
【任务：1129 产品编码配置基础数据】
6 years ago
46fc5f5750
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
90ec0f107e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
32dbaed8fe
【任务：1129数据对象、对象结构、产品包装关系基础数据】
6 years ago
王杰
d2c7a81893
Merge branch 'dev' into test
6 years ago
855cc46448
数据抽取修改 1116
6 years ago
07a80e7fd2
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
46e0488d5a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1de5b8b196
数据抽取修改 1116
6 years ago
851ba63e7c
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f111febd8d
修改“其他”安灯类型的名字为“自处理”， 统一修改获取组织代码的方法
6 years ago
3645368544
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b963bcb502
LAC 日志处理功能完成
6 years ago
219bf6db9a
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
457e10bc75
1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】
6 years ago
04453aa706
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
047b9d5e35
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
02e3ac4960
【库存预警】bug 修复库存预警
6 years ago
王杰
a95b6baae1
Merge branch 'dev' into test
6 years ago
828cf66784
【需求：1090 工序BOM，物料绑定记录删除多余字段】
6 years ago
王杰
dfec2532cb
Merge branch 'dev' into test
6 years ago
69be002972
【装箱防错】【301-4.2条码装箱防错】【1118条码装箱防错建任务】
6 years ago
王杰
7291a7a85c
Merge branch 'dev' into test
6 years ago
86a18d730a
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
9907813aed
Lac调度实体
6 years ago
c9f26c22c1
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
bbec6a1002
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7799937093
成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除
6 years ago
王杰
1846c6f4f8
Merge branch 'dev' into test
6 years ago
438517be44
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
6c847cf305
【需求：1091 返厂返修添加字段和枚举】
6 years ago
王杰
2069d6a3ae
【需求：1125，设备报表】
6 years ago
王杰
9446a76159
Merge branch 'dev' into test
6 years ago
f67a61ec92
网关 添加 APS 路由
...
BASE URL 路径优化
6 years ago
王杰
42ec1b3693
Merge branch 'dev' into test
6 years ago
王杰
dcaf007f4d
【需求：1107，生产工单首检件】
6 years ago
王杰
35cf3cf162
Merge branch 'dev' into test
6 years ago
bc13a8a3ac
【需求：1090 返厂返修增加分页查询】
6 years ago
c79786a677
合并开发分支的代码POM文件被改成DEV修改回TEST
6 years ago
a5609d97fb
【1092 返厂返修增加枚举】
6 years ago
18161e8191
Merge branch 'test'
6 years ago
67461457fc
Merge branch 'dev' into test
6 years ago
1e0f0c706c
安灯问题修复
6 years ago
f093a97cf0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
4eaa8b5b17
导入导出
6 years ago
6902c79472
问题清单问题修复
6 years ago
7d8b8664cc
问题清单问题修复
6 years ago
王杰
56996126be
【需求：1101，mes同步设备安灯维修任务】
6 years ago
73aef5326c
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
d0b98f0869
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
00e849a62e
(1089 过程质量检测基础数据；1090 返厂返修基础数据)
6 years ago
3bc277178e
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
e15e402890
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
0c20a2b655
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
ca0cf21a7c
【NC解冻-4.2 组件复用】PR12-01~PR12-02
6 years ago
a537daee62
导出不导出有效性
6 years ago
caf6dc17ab
【NC冻结】nc冻结
6 years ago
44fccb14d6
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
王杰
09cff08e1e
[需求1086，设备点检保养作业，第2次提交]
6 years ago
d5864ba490
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
5e78c31a70
LAC 名称修改
6 years ago
15e812c7a6
Merge branch 'test'
6 years ago
9558225174
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
87ffdfd9a3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ac7b0415ba
1083 添加枚举字段
6 years ago
5c67a7bb5f
MySQL 数据库不支持 CAST AS DOUBLE，需要改成 CAST AS DECIMAL
6 years ago
0526da8ee3
Merge branch 'test'
6 years ago
cd74f5336f
Merge branch 'dev' into test
6 years ago
王杰
fa25769c50
mes枚举
6 years ago
e89df89f9a
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
0d0178545c
mes设备
6 years ago
e8336c85d7
idea 异常 文件格式化
6 years ago
7139d9b5f1
解决冲突
6 years ago
9e4930968f
解决冲突
6 years ago
8a517bc0b9
返厂返修增加字段
6 years ago
febbea09c3
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
0fdabe4950
知识库 ，自处理开发
6 years ago
1de89d732b
本地误拉了test代码，解决pom
6 years ago
9f9874902d
冲突解决
6 years ago
曾贞一
e603ac66a7
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
5a036f14cb
mes设备作业任务
6 years ago
7fc439319e
返厂返修
6 years ago
413266293e
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
030391a93c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
56d7457826
工位监控提交
6 years ago
曾贞一
5e7fb00d0c
【生产领料】
6 years ago
1f1b4f7511
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
48a6cdc39c
作业任务：作业类型 枚举增加
6 years ago
e260045c42
Merge remote-tracking branch 'origin/test' into test
6 years ago
97763d6b53
安灯广播， 安灯管理显示不同界面， 添加操作来源字段
6 years ago
王杰
b561110e54
Merge branch 'dev' into test
6 years ago
王杰
9cc89f9397
mes设备周期计划
6 years ago
2f843a8f5a
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
986157043d
流程设计：新增组件参数类型：可配字符串
6 years ago
王杰
611b25abfd
Merge branch 'dev' into test
6 years ago
d91fa61c88
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
6c1891c193
软适配报文状态及微服务接口调整
6 years ago
05fd0fe686
WebService Server 优化完成
6 years ago
7863325afd
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
6 years ago
b7b78b85ac
误拉了test分支的代码：还原
6 years ago
d351c36ffc
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
c681340355
工位监控添加枚举一字段
6 years ago
52a5fe74af
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
029f14d36f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java
6 years ago
83a7a9e988
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
d9dd10761e
WebService 欧洲对接完成
6 years ago
王杰
2ed8ebdbd7
Merge branch 'dev' into test
6 years ago
0e7c7fbfb2
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
45b4264c67
导出显示bug修改
6 years ago
1758a4e50e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
a79769d229
mes-pcn枚举
6 years ago
王杰
37f7e92d53
mes实体类
6 years ago
8deff73454
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
508d4b5aba
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
6 years ago
d83de01d33
服务端适配日志bug解决
6 years ago
722146acd8
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
417b4a09db
代码格式优化增加枚举
6 years ago
d406532b37
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1e5e35ee6f
Pojo 合并代码
6 years ago
fe1e83609e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f3867c64f4
软适配微服务接口
6 years ago
61a38c9acd
WebService Server 优化完成
6 years ago
a961da57ef
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
778c1a79a7
【静态盘点】增加库存调整盘点
6 years ago
dc3fd624f2
Merge branch 'dev' into test
6 years ago
219b2d2ad3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
104d308d30
PLC DB 设备故障 过程质量检测
6 years ago
8148fc86e6
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
c39462cd35
安灯广播
6 years ago
b22c6fbcaf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
王杰
d814887570
mes设备
6 years ago
b43f4aef72
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
73b8fd1de4
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
09ea0929e4
枚举
6 years ago
a791430fec
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
df6f432534
1012 修改绑定关键件 和 工序bom添加isBindKey
6 years ago
f778b15ea5
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
40321ed7ec
Merge branch 'test'
6 years ago
4e2373bdae
Merge branch 'dev' into test
6 years ago
20843e06a6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4654fad2bd
1011 生成条码工步
6 years ago
91fada5cc0
枚举修改
6 years ago
672438f2c0
Merge branch 'test'
6 years ago
b6179f9f71
Merge branch 'dev' into test
6 years ago
be63f4eab9
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
37e2a88ca7
物理安灯和软件安灯插入安灯附属表的逻辑
6 years ago
04cdf58aef
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
658b25bd65
格式化代码
6 years ago
3ebf17adb1
格式化代码
6 years ago
926c9c3d60
方法移值
6 years ago
0924810e64
Merge branch 'test'
6 years ago
d11058019b
枚举
6 years ago
cf3ee95623
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6596931124
枚举
6 years ago
56f7048098
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
4b032ac426
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
16073eb7e5
安灯附属表插入时， 完整数据； 添加安灯来源接口
6 years ago
89ab1816e3
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
8d7c77d3ed
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71a68e8cf6
枚举
6 years ago
c955047746
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1769e7765f
加了main方法发版报错
6 years ago
王杰
95cc0b433e
mes组织模型bug修复
6 years ago
王杰
18bc35f60d
Merge branch 'dev' into test
6 years ago
c67fe92297
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3e8bcbeb84
枚举
6 years ago
60f441e685
Merge branch 'dev' into test
6 years ago
d495046dcf
添加XML 工具实现
6 years ago
473e2caea0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2cf4759c21
枚举
6 years ago
60d1798b9c
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
ddfb47e6ac
mes设备台账功能开发
6 years ago
1e41ab2e39
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
9553e962e3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bd55a18bf6
微服务接口 - 打印模板分页查询
6 years ago
232c675444
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
d2c3045575
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
84a96a22fa
新加NotNumBiggerPackContainsZero方法
6 years ago
4477820c1b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
68b0058e1b
枚举
6 years ago
1defd0d8be
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
a11eeae45c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ee11674ab
读取托盘
6 years ago
曾贞一
e24474fc8c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
2b62357ab5
VDA收货【生产快速入库】组件，任务编号1051
6 years ago
cecd37a1e7
添加Xml 工具
6 years ago
1d17198daf
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
ac1c18581e
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
d8c740819c
FTP适配器
6 years ago
61804a27b3
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
ddf1d2e6dc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5a5b7b882e
条码模型
6 years ago
4ceba7144c
【物流线路修改】 修改枚举值重复问题
6 years ago
10fcc569bd
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
8beee972a9
【物流线路维护】 增加处理模式类型
6 years ago
e9f82d9259
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
692110b92b
【物流线路维护】增加前端处理模式枚举
6 years ago
e35cf183da
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
42a8fb357f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
82fe491bd3
#1050 工位监控
6 years ago
7a403a37da
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
4409f34e0f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3ef7d24eab
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
3cc1997ae2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c2da7410eb
新增枚举提交
6 years ago
e20ee7b1ff
安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤
6 years ago
fe174a47ee
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
fb9340fc09
安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑
6 years ago
30eee05b1c
Merge branch 'dev' into test
6 years ago
766d195088
开线合并代码
6 years ago
183fd78eac
冲突解决
6 years ago
99382a8fca
Merge branch 'dev' into test
6 years ago
eb70017396
Xml 解析添加重试机制
6 years ago
曾贞一
bc83b57f8e
合并代码
6 years ago
曾贞一
fb86682652
VDA 生产快速入库
6 years ago
0982f01eb2
Merge branch 'dev' into test
6 years ago
26684524f1
生产报工组件和生产报工标签组件提交
6 years ago
7e3edd06a0
Merge branch 'dev' into test
6 years ago
22fbbe2a91
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
edfc78995b
新增打印机配置表
6 years ago
3b46d242a7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
6 years ago
d830c78d03
FTP适配器
6 years ago
4e303413ff
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c0fc2c36bf
Socket 适配器完成
...
MQ 适配器完成
6 years ago
王杰
80f50fe800
Merge branch 'dev' into test
6 years ago
王杰
804574090f
pcn生产工单
6 years ago
a601d5ddf3
orderBy方法去掉为空判断
6 years ago
9ae6ee5016
Merge branch 'test'
6 years ago
51c21f2c22
Merge branch 'dev' into test
6 years ago
d8824ab066
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
4173f0637f
安灯正式环境发布
6 years ago
曾贞一
8a89b95ebf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
cd8a5df991
VDA 生产快速入库组件开发
6 years ago
829171f8a4
Merge branch 'dev' into test
6 years ago
ef6c47dc35
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e42cd80b8b
条码打印枚举添加待退料状态
6 years ago
9e12bb5da3
Merge branch 'dev' into test
6 years ago
87dfdc6471
增加方法notInPackArray（）， 修复工具类 notInPack() notInPackString()方法无效的问题
6 years ago
f96cbd1be3
Merge branch 'dev' into test
6 years ago
033b23321f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7c472b386a
提交
6 years ago
355cd49649
注释 WebService 发送邮件客户端
6 years ago
790c0b4ec6
Merge branch 'dev' into test
6 years ago
7131271edc
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
cbc5882bd5
Merge branch 'dev' into test
6 years ago
王杰
d676bcf974
mes生产工单下达配置状态
6 years ago
c10bf2e3e1
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
4b17c6ca69
Merge branch 'dev' into test
6 years ago
王杰
310d0f0606
mes生产工单审批
6 years ago
曾贞一
d07173bd64
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
dcc13e622b
Merge branch 'dev' into test
6 years ago
5cb2e7994b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cf64f0118a
提交
6 years ago
f3f77e63b3
Merge branch 'test'
6 years ago
4d5497929a
Merge branch 'dev' into test
6 years ago
a9e369e716
任务枚举添加导出转换方法
6 years ago
0b8bc114bc
服务端调整
6 years ago
2d911c4257
安灯优化
6 years ago
27a7aa960c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
37701bed62
提交
6 years ago
c47c617aab
Merge branch 'dev' into test
6 years ago
王杰
8570b88761
mes生产工单
6 years ago
c17039ce4a
Merge branch 'dev' into test
6 years ago
4e1635fe7e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9b0c5de954
提交
6 years ago
曾贞一
6c8cfd8678
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
52a770ad45
Merge branch 'dev' into test
6 years ago
王杰
24a31c0bdf
生产工单实体
6 years ago
541ea98d98
Merge branch 'dev' into test
6 years ago
a9a318e354
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
61b0dfdc3b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
809478be44
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d8bc8d713d
条码打印model字段添加
6 years ago
41588f37d7
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d1d7e65f97
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
c7ed8613d6
软适配添加WebService 默认处理
6 years ago
83f400a36b
sql 注入 删除斜杠
6 years ago
b31162c5d6
安灯工位放行， 安灯任务管理界面数据权限控制
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
f6bb2ee21f
Merge branch 'dev' into test
6 years ago
曾贞一
337e5f7084
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
f17c1d3d25
推荐入库 组件开发
6 years ago
王杰
2460fbc3b4
生产计划
6 years ago
564deb4d6b
适配记录及数据库适配器
6 years ago
3474bb82c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f978ee39c8
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f6c1eff0f1
excel通用导入优化
6 years ago
d120b1615a
国际化工具类
6 years ago
ee979c6e02
Merge branch 'dev' into test
6 years ago
9caf9a4458
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2f904f9eee
数据库适配器
6 years ago
c27449a185
异常信息国际化
6 years ago
d23045a667
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5b6477bba6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
510485d2f0
excel导出优化--单据状态显示枚举描述
6 years ago
51974a46b9
WebService 调用发送邮件测试
6 years ago
35beb0c60e
Merge branch 'dev' into test
6 years ago
377a875fec
软适配客户端代码结构调整。
6 years ago
fc1c7ab797
软适配添加-所有适配命令 接口
6 years ago
2c6b223628
软适配客户端代码结构调整。
6 years ago
212cfb02af
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71798e9f51
软适配功能配置优化
6 years ago
eeff3517c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
6 years ago
07688db533
软适配实体
6 years ago
74bdaccfbd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8ed0d4d60e
枚举维护业务类型数据
6 years ago
f2e2dd1670
软件适配器 数据源适配器
...
单号生成高并发优化
6 years ago
21241e45ca
软适配功能配置优化
6 years ago
5144d15ac4
采购单报表开发
6 years ago
bbfc9b320f
Merge branch 'test'
6 years ago
4a1ad40dfa
Merge branch 'dev' into test
6 years ago
b899c5c8c5
软适配 WebService 功能接口开发
6 years ago
e921bb72d2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
6 years ago
9ec5e63da6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5b200f824f
软适配 WebService 功能开发
6 years ago
3eef8ea750
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
029d7eac62
软适配model
6 years ago
2d376575a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3c6d17a283
修改pojo数据类型
6 years ago
ccffe9b7bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c44a99eb40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
61a7985afc
提交 0905
6 years ago
5b97a9e0cb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
241a478f65
excel导出优化--单据状态显示枚举描述
6 years ago
8d8752b8b4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
89b0a4a68a
条码打印调试
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
f0fba5e23a
盘点枚举添加--excel导出
6 years ago
曾贞一
b7bd96fa44
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
64aed1f49c
开发 Restful 接口测试PDA
6 years ago
8f1ac3fdae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f370f377d4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ce78b170f
工作参数枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
0a3339ba8d
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ff462900b7
枚举描述添加
6 years ago
2e8a70d8b4
pom版本还原--pojo
6 years ago
王杰
482159b322
mes-pcn定时任务枚举修改
6 years ago
53a08621fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
db4f6bcdb1
流程管家：添加作业记录明细（快速流程每一次扫条码都会生成一个新的移动单）
6 years ago
b760543b3b
excel通用导入优化
6 years ago
a5b01bbaae
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
69d2932ca4
http请求增加不需要设置请求内容枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
3a1cf7a2b7
判断属性是否有final修饰
6 years ago
b4b095c970
判断属性是否有final修饰
6 years ago
4d5c92df78
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
d5cfe77ac5
mes定时任务枚举
6 years ago
32502582c1
新增属性初始化
6 years ago
eadb86ce60
excel通用导入优化
6 years ago
fb3b8a033d
excel通用导入优化
6 years ago
7aec1fdb6a
添加工步类型枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7f3f39af06
提交
6 years ago
63c0f02f32
提交
6 years ago
146cf768d6
提交
6 years ago
5e06022e51
Merge remote-tracking branch 'remotes/origin/dev'
6 years ago
24a9d3ff2c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8a5337daad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
235a728c0e
andon
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
9c26f45cd5
明细状态枚举添加
6 years ago
王杰
2e86ff81d0
mes工作单元参数增加枚举
6 years ago
王杰
6929e88570
mes-pcn定时任务
6 years ago
曾贞一
ae12af551b
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
cfc0de67cf
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
057fa88904
revert
6 years ago
c6584a9437
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
368a3a1c66
mes枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7740503a97
getByProperty查询到多条数据抛异常
6 years ago
1b06c1d07f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
5947f88da1
mes-pcn定时任务工作清单数据同步
6 years ago
b7e17c5451
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
2325d18660
软件适配器 认证参数接口
6 years ago
3bedf8fb8d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
6 years ago
953f593207
提交
6 years ago
592cd15add
调试枚举删除、库位导入工厂字段添加
6 years ago
曾贞一
25e7ca08d3
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
7e5d2e1e56
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
1f1a9c39fc
异常国际化功能开发完成
6 years ago
曾贞一
5aceaca82d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
9680112434
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
18aff86ea0
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
王杰
3b3ddd581a
mest条码生成规则最大值是否循环枚举
6 years ago
6d925d6b9f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a38347d2fb
revert
6 years ago
34e2c13b38
getByProperty获取到多条数据报错
6 years ago
c901f18f89
pom版本还原
6 years ago
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f6b49bf31a
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
9bea065f35
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
b10b967b73
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
884f3e1a96
合并代码
6 years ago
王杰
aebe742280
mes枚举增加关键件条码规则信息模块的绑定规则
6 years ago
d7b0f30d91
IMPP 平台功能功能优化 . 软适适配功能开发
6 years ago
88f735ff63
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5e72d98ad8
提交
6 years ago
4359f347c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1328dc7ddd
#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
曾贞一
acd1e6cfb6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
ce70994a57
盘点 按照盘点差异类型汇总
6 years ago
a2a4dc6beb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
e83efe76e0
软件适配器 测试
6 years ago
0b13c6dd70
order by 列类型装换
6 years ago
f10ff69ce0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
6 years ago
1d55cd22a6
order by 列类型装换
6 years ago
39a00d3a19
order by 列类型装换
6 years ago
e8741ec364
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
1b30b927ce
自定义表单功能优化
6 years ago
曾贞一
e1cb06da5c
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
483ea59142
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c34a369e93
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ef1450e912
Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
b9d9d7402e
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
7002ac5a8a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
619251474d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f5c0ca9383
软适配模型调整
6 years ago
c05e3b13c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
63d86a4b0d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ecba29948f
816 add method
6 years ago
69525fbaa9
表单菜单排序
6 years ago
曾贞一
fbe8544a02
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
cef48801df
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
7455c6c640
软适配配置文件初始化
6 years ago
aee54acafc
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
46c710e559
表单功能优化，虚拟属性连表查询，时间格式化对接
6 years ago
6d99080069
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c986f7b2a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
9ee2901346
添加字典分组
...
优化redis资源键
6 years ago
66f49f3fdc
自定义表单功能调整
6 years ago
曾贞一
47d4a53706
Merge branch 'dev'
...
# Conflicts:
# modules/i3plus-pojo-andon/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-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
6 years ago
曾贞一
8b457c0618
DEV 合并 TEST pom.xml文件修改
6 years ago
4235184afc
Merge branch 'Process' into dev
6 years ago
e7913cfb26
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
6 years ago
24da688384
Merge branch 'test' into dev
6 years ago
31313baec9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
曾贞一
b3a0a71065
库存初始化信息
6 years ago
476d943a69
流程管家：自定义按钮触发的时候不需要预先调用当前步骤的回显信息
6 years ago
40fc36ef18
流程管家优化：快速提交流程手动提交校验
6 years ago
af7b2404dd
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
d8786d8132
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
fb07628555
Merge branch 'dev' into test
6 years ago
c1cff11c7c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
363d521c36
Merge branch 'test'
6 years ago
d45b7b77f3
Merge branch 'dev' into test
6 years ago
bb8078cb94
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7f3d902a30
流程管家：提交检验+预回显优化；
...
直送发运JOB:#5132
6 years ago
750e4d75dc
添加 XStream 插件
6 years ago
bda52f76c6
软适配 Json 请求适配完成
6 years ago
b4dc0c254b
Merge branch 'test'
6 years ago
24bbd75c81
Merge branch 'dev' into test
6 years ago
曾贞一
c7571b4c66
IS_GENERAL_TASK 添加单据是否生成任务状态 撤销
6 years ago
60e6d51d35
流程管家2.0
6 years ago
19871c5f27
Merge branch 'test'
6 years ago
8f977719c0
Merge branch 'dev' into test
6 years ago
5a7ce32761
冲突
6 years ago
b5c204f873
软适配接口制作完成
6 years ago
562ea029fc
Merge branch 'test'
6 years ago
5c48b2eb79
Merge branch 'dev' into test
6 years ago
035a8b5924
定时任务日志信息优化
6 years ago
90439f55fd
添加 XStream 插件
6 years ago
c4db15db9b
添加 XStream 插件
6 years ago
47238f131b
Merge branch 'test'
6 years ago
8daa2789a4
Merge branch 'dev' into test
6 years ago
7181e85ba5
安灯导出实体注解
...
定时任务日志添加字段
6 years ago
6598a829e0
Merge branch 'dev'
6 years ago
ccf0764ee6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
812be94ed3
Merge branch 'dev' into test
6 years ago
7f35883b08
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
90fb9d3190
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
fb743ebafc
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
409cbb8492
Merge branch 'dev' into test
6 years ago
4a717ec544
直送发运JOB+交易处理程序（下线结算）逻辑变动
6 years ago
f4141fd2c6
Merge branch 'dev' into test
6 years ago
曾贞一
60feef4bb5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
2240819def
发泡打箱包装
6 years ago
6e2cf70951
库位校验枚举添加
6 years ago
49a936c660
Merge branch 'dev' into test
6 years ago
06bd10152c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7f1ef0bca7
自定义报表表单打通， 用户在线设置功能优化
6 years ago
d63974140d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
af2e1a811c
andon组织模型导入功能
...
andon删除关联数据校验
6 years ago
577e1372ab
Merge branch 'dev' into test
6 years ago
a064c6b84a
枚举新增条码类型
...
库存条码表新增字段
6 years ago
ad09180809
Merge branch 'dev' into test
6 years ago
c1ca7cbcae
Andon组织模型操作接口
...
Andon班次计算调整
6 years ago
4149183450
Merge branch 'dev' into test
6 years ago
c11cc65e8f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
d7b79c659c
WMS获取系统配置信息
6 years ago
0526fcf05c
Merge branch 'dev' into test
6 years ago
19afeb92b7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fea0d476a4
基础操作,数据补全
6 years ago
0e15934d16
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6a3662283b
枚举修改赋值
6 years ago
0ed90485a6
安灯基础数据导入导出
6 years ago
6ba7a43ea7
Merge branch 'dev'
6 years ago
4350a82043
1. 完善脚本引擎
6 years ago
353b8a37c5
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
e1824dbba4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c858475bd2
用户权限调整 部门权限调整完成
6 years ago
24f7ae3471
Merge branch 'test'
6 years ago
3a19888ddf
用户权限调整 岗位功能调整完成
6 years ago
53d34096f7
Merge branch 'dev' into test
6 years ago
8e39e6d9fb
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
0041ce328e
定时删除日志
6 years ago
78cd5dc77e
用户权限调整
6 years ago
d9ef2677fb
Merge branch 'dev' into test
6 years ago
f4613c2f5c
Merge branch 'test'
6 years ago
1b1bc67c90
用户权限调整
6 years ago
61ecc2a74f
Merge branch 'dev' into test
6 years ago
fba99de795
枚举修改
6 years ago
d47c9f8650
合并冲突pojo
6 years ago
f0e0867e2c
库存移动pojo新增字段
6 years ago
a1f8ca3096
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d2839f6cf2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
58b067e3cc
库存报表存储区级联子存储区查询
6 years ago
5741bfa2e6
Merge branch 'test'
6 years ago
5bed1d27ec
Merge branch 'dev' into test
6 years ago
79b36a30a4
冲突合并
6 years ago
fe3d392e9b
新增枚举信息
...
移库单明细表冗余主表临时字段
新增物料表字段
6 years ago
f3eb8d2356
Merge branch 'dev' into test
6 years ago
541b40d182
合并代码
6 years ago
53135c27f5
Merge branch 'test'
6 years ago
b39d7038fa
Merge branch 'dev' into test
6 years ago
dec3743911
流程管家推队列查询条件没有封装
6 years ago
2cbc082c7b
动态对象 空数据处理
6 years ago
eeefb843b4
Merge branch 'test'
6 years ago
37b8755485
Merge branch 'dev' into test
6 years ago
d3deaa6081
安灯bug解决
...
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
6 years ago
e43c493463
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
994da92b4e
交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG
6 years ago
c02d22ecba
Merge branch 'test'
6 years ago
b18d393fe0
Merge branch 'dev' into test
6 years ago
e95db40c23
123
6 years ago
543171dfbb
Merge branch 'dev' into test
6 years ago
1ac5542541
动态表单分页功能完成
6 years ago
c436c8ee3d
Merge branch 'test'
6 years ago
e3354f52bd
Merge branch 'dev' into test
6 years ago
92daec97e3
枚举修改名字
6 years ago
b8730fac47
Merge branch 'dev' into test
6 years ago
ac5bf14d6b
动态表单动态操作 功能优化
6 years ago
15386ae5c2
枚举
6 years ago
628f1db31c
Merge branch 'dev' into test
6 years ago
ff9a5dcd17
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
98de08ba4a
文件上传优化
...
字段删除异常
日志添加索引
6 years ago
96264870c2
Merge branch 'dev' into test
6 years ago
efbe9dac9e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bf02cbf8a4
PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
6 years ago
99710d5c20
Merge branch 'test'
6 years ago
9c38ed702a
Merge branch 'dev' into test
6 years ago
97adebba21
枚举新增 实体字段新增
6 years ago
3b1d19bbab
Merge branch 'dev' into test
6 years ago
a8dee4713a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
31f6f4deef
枚举字段新增AMP
...
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
6 years ago
1b569ff3a8
ERP同步标识枚举添加
6 years ago
f4bf536296
Merge branch 'test'
6 years ago
ee5a4f1dfe
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
0962b810ce
Json 转换精度丢失
6 years ago
5d2695a5cb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a551249165
Merge branch 'dev' into test
6 years ago
2e5b7466c8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1b4e5143aa
用户单帐号多平台登录
6 years ago
364efedc42
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c783d9119c
任务列表查询查出了状态为30的任务+流程处理组件execute方法提升事务级别+枚举添加根据枚举名查找枚举详情的静态方法
6 years ago
d39c16c5d5
Merge branch 'test'
6 years ago
49d35f264e
Merge branch 'dev' into test
6 years ago
35f92b05e3
1. 修改ERP接口暂存表的字段，增加关联单据类型
6 years ago
1ee9cb24f2
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
7861048e31
Merge branch 'test'
6 years ago
2ce560b39f
生产报工明细实体修改和枚举新增
6 years ago
470d319504
Merge branch 'dev' into test
6 years ago
3cc4aec00a
库存预警看板
6 years ago
2f1a3080ba
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
05c56e46b4
库存预警看板开发
6 years ago
176f9ffd5f
Merge branch 'test'
6 years ago
713503d7ff
Merge branch 'dev' into test
6 years ago
5d1447c92a
1. 解决标准拣货多级存储区查找的问题
6 years ago
41324abdad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
854ee5b3cf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
6 years ago
0f3d67d110
供应商收货看板功能完成
6 years ago
8347085f26
冲突
6 years ago
e3d5e5bb19
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
6 years ago
eb2f61c32f
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
4309454d2a
邮件异常提示优化
...
EXCEL数据通用导出
6 years ago
f32f7e72a2
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
f3151cbbe3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e13d4163b7
库存交易报表代码提交
6 years ago
a4016dc911
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
34dcf6d526
枚举修改
6 years ago
33ec897657
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
734340fe63
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
7b83985f40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f6bf244b12
流程管家放MOVENO的BUG
6 years ago
6259bd56bc
通用EXCEl导出MODEL
6 years ago
320910e2ae
Merge remote-tracking branch 'origin/dev' into test
6 years ago
dfef27151d
冲突
6 years ago
f834e91353
Task#764+枚举TRUE_OR_FALSE
6 years ago
32cc1db3bf
Merge remote-tracking branch 'origin/dev' into test
6 years ago
62b2ea298b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
6 years ago
ea83820fbf
新增物料类型跟单位类型
6 years ago
b3272dc3d7
冲突
6 years ago
fe13a43ccc
WmsEnumUtil冲突（几步法）
6 years ago
ea4cde868f
Merge remote-tracking branch 'origin/dev' into test
6 years ago
fb98db0bcc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c08a569ac5
sql优化
...
数据权限实体增加字段
枚举增加数据权限的交易对象
6 years ago
7d0cd674cf
零星退料指令导入开发
6 years ago
79d1da3230
系统数据初始化
6 years ago
bec3a7098d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
16bb8d6714
Merge remote-tracking branch 'origin/dev' into test
6 years ago
8e41b40196
excel工具类优化
6 years ago
884d4fd763
Merge remote-tracking branch 'origin/dev' into test
6 years ago
21746dc440
excel工具类优化
6 years ago
163cb6240e
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
31c347275c
添加重要度枚举
6 years ago
ac8b9d3986
Merge remote-tracking branch 'origin/dev' into test
6 years ago
b7a7eb29ae
安灯类型 查 表 已从表改为枚举
...
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
6 years ago
68fadff818
Merge remote-tracking branch 'origin/dev' into test
6 years ago
2adff745fb
自定义表单 功能优化
6 years ago
0fb7e05e88
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
10c276fb16
自定义数据源
6 years ago
511df468ec
Merge remote-tracking branch 'origin/dev' into test
6 years ago
13af329513
动态查询Cloud 服务基础功能已完成 1.0
6 years ago
钮海涛
jenkins
许心洁
王杰
wei.peng
宋军超
袁津哲
qianhs
luweihao
zcg
曾贞一
jokelone
汪云昊
gcj
e-jiawentao1
puxiao.liao
WYnneaoapc
E
陈思洁
crish
qinjia zou
于学杰
puxiao.liao
张哲铭
alwaysfrin
刘辉
lbwgithub
刘敏
jimmy.zeng
peter.pan
jenkins
jenkins
sky.meng
shiyanghuan
wei.peng