399c9c828e
Fix Bug #1916,1917
6 years ago
8ef3997038
还原pom
6 years ago
钮海涛
47131ff13f
修复版本问题
6 years ago
44f313abc4
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
6 years ago
8955fd2f4d
mes提测 还原pom
6 years ago
23754d3f18
mes提测 还原pom
6 years ago
钮海涛
999a415d27
修复版本问题
6 years ago
钮海涛
b303cf9a14
修复合并问题
6 years ago
99d3c9d721
提测合并 还原pom
6 years ago
5ef88c80c0
提测合并 还原pom
6 years ago
6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
9ee8acae91
合并代码 有代码丢失或者文件丢失请排查此处
6 years ago
f161270af8
版本发布
6 years ago
e47f050ff3
优化通用导入工具类和导入逻辑
6 years ago
0ccadab4be
任务：【1842】-海纳川通用导入修改对应工具类、实体和model
6 years ago
1f55c06368
任务：【1842】-海纳川通用导入添加对应工具类、实体和model
6 years ago
5d1c79ef13
Task1812:仓库健康度指标视图及相关指标自定义( #476 )
6 years ago
6e3da00fda
Task1812:仓库健康度指标视图及相关指标自定义( #476 )
6 years ago
3e65986585
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
0e2f50e562
Task1812:仓库健康度指标视图及相关指标自定义( #476 )
6 years ago
王杰
786c442d55
解决冲突
6 years ago
钮海涛
c1241bd6c5
修复版本问题
6 years ago
钮海涛
53a421b3b9
修复版本问题
6 years ago
钮海涛
94e9b2ffec
Merge remote-tracking branch 'remotes/origin/master' into test
6 years ago
王杰
029763feb1
pom
6 years ago
王杰
30fcf4f23f
pom冲突
6 years ago
717f268c28
POJO版本号还原
6 years ago
钮海涛
281ef662b1
merge test
6 years ago
99b5048ef0
POJO添加序列化id
6 years ago
7778ce1afd
类序列号
6 years ago
曾贞一
c85fd2eff0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
24ea607718
【8441 收货回执打印功能完善】
6 years ago
3669fbb4a4
本地版本库雪崩,有问题请排查此版本
6 years ago
王杰
a6e9b90026
pom
6 years ago
王杰
de9017ca5c
冲突
6 years ago
王杰
7d192b36a6
pom冲突
6 years ago
1dad60b129
修改pojo表字段查询页面--添加字段的详细注释，页面查询添加【系统】查询条件Bug：8420
6 years ago
钮海涛
da8b4db890
修复pom版本问题
6 years ago
75be7d5078
任务#1744：全局替换自定义搜索功能
6 years ago
0b3d2d6815
软适配REST 适配器调整优化
6 years ago
王杰
de200de372
mes
6 years ago
279ec2d1fe
授权加密问题修复
6 years ago
b23915236b
开发根据实体动态生成数据库文档页面功能
6 years ago
曾贞一
f3e53ff1eb
【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】
...
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
6 years ago
effae233bf
对象历史记录 Pojo 创建
6 years ago
fe46d8da29
1. 授权封装位置调整
...
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
6 years ago
109c4429ce
还原dev pom
6 years ago
9518628c12
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
533d8e55e8
开发导入模块功能
6 years ago
ccf2f42840
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
edf0b66115
Sonar代码缺陷修复
...
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
6 years ago
5d8fec4938
合并冲突
6 years ago
7505087392
【mes 产品配方导入功能和基础数据维护】
6 years ago
钮海涛
100d8b0019
Merge branch 'test' into dev
6 years ago
34c77d6944
ICS 注册中心监控接口，Actuator对外端口调整
6 years ago
a2f7c3426e
bug7994【7994 麦格纳收货需求差异】
6 years ago
1051b22575
ICS 注册中心监控对象
6 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
6 years ago
8a8c3ee34d
pom版本调整
6 years ago
e7d176209e
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
6 years ago
64d83d238f
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
6 years ago
3fd17208e2
枚举更新
6 years ago
贾文涛
492dfbff82
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
6 years ago
1d00303306
自定义报表-折线图,饼图,柱状图,矩形图 完成
6 years ago
钮海涛
82d5332861
修复POM文件问题
6 years ago
ec1d52e7dd
MAVEN 版本控制调整
6 years ago
贾文涛
7106c06221
统一修改pom文件的项目版本问题0331
6 years ago
44696061ee
修改pom文件为最新
6 years ago
c8c7c73336
自定义报表 布局,元素,报表 功能优化完成
6 years ago
d80b341620
还原test pom
6 years ago
贾文涛
048419d823
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
6 years ago
4b4bf4e433
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5bf7133ff1
动态查询：BUG#7845；BUG#7676；BUG#7675
6 years ago
曾贞一
779b9d209c
【修改 DEV-pom.xml】
6 years ago
12579c7a14
还原pom
6 years ago
王杰
999aae6fc0
解决冲突
6 years ago
曾贞一
2625c2cb0f
【修改 TSET-pom.xml】
6 years ago
王杰
80ca438ce3
test合并到dev解决pom冲突
6 years ago
钮海涛
669874cb9b
Merge branch 'dev' into test
6 years ago
1d90195de6
3D仓库
6 years ago
曾贞一
5ebb5cbf20
【修改 TSET-pom.xml】
6 years ago
王杰
068a0956db
解决冲突
6 years ago
王杰
b77d3065a4
Merge branch 'test' into dev
6 years ago
3d3f134d7f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c9f6f336af
动态查询：解决了BUG#7658,7660,7661,7663,7664
...
3D仓库：联调优化逻辑
6 years ago
曾贞一
0acf2dc0ae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
钮海涛
b323b2feae
Merge remote-tracking branch 'origin/dev' into test
6 years ago
00252caa0c
移动mespcn公用model
6 years ago
cc98e84ba4
动态查询：增加开窗功能
6 years ago
f67dd06cd4
Merge branch 'dev' into test
6 years ago
b8d7feb413
动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解
...
+
字段无需区分工厂
6 years ago
66f7121975
Merge branch 'dev' into test
6 years ago
632ad62c45
动态查询：查询类名需作为动态入参
6 years ago
246dd85721
Merge branch 'dev' into test
6 years ago
55e3f212ce
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7f161e3bae
3D可视化仓库
6 years ago
1ada447069
Jenkins自动合并
6 years ago
53a2152ff1
【 7531 在网页的条码打印界面增加一个按钮，可以修改部分条码数量，修改条件，库位为空，库区有值，条码状态为待入库。此部分条码为日生产计划生成的条码。
...
】bug7531
6 years ago
24d834cd6d
Jenkins自动合并
6 years ago
e1114d67d2
【静态盘点解冻调差时，如果勾选了所有盘点单，现在需要一个单子一个单子点击确认调差，需要在点击时将所有盘点单的调差范围都显示出来，然后一次性调差所有功能】【bug7485】
6 years ago
335c725bca
Jenkins自动合并
6 years ago
4ccda48061
【 PDA所有流程中，扫描后默认提示的组件去除】【bug7409】
6 years ago
27b1f5ca21
Jenkins自动合并
6 years ago
22eaa30dab
【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】
6 years ago
a3823f4a16
Jenkins自动合并
6 years ago
2d30f2da0f
Wms动态搜索与自定义列表，表单开发
6 years ago
d790bcf355
Jenkins自动合并
6 years ago
67ef5c5516
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
89a7cafee4
Wms动态搜索与自定义列表，表单开发
6 years ago
33e68b7e9f
Jenkins自动合并
6 years ago
cb68f62e46
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8a4974f369
自定义报表 调用调整
6 years ago
6371e8df60
Jenkins自动合并
6 years ago
f7c98e3982
Wms动态搜索与自定义列表，表单开发
6 years ago
a19cace3b1
Jenkins自动合并
6 years ago
b64327831a
【 7402 收货回执界面，查询条件增加一个ASN组号，显示列表中也增加一个ASN组号
...
】bug7402
6 years ago
c1609539cf
Jenkins自动合并
6 years ago
de0d57179c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
35839db806
BUG#7359 任务列表分组字段和移动单赋值逻辑更改
6 years ago
a0b67a3723
Jenkins自动合并
6 years ago
8285c87624
Wms动态搜索与自定义列表，表单开发
6 years ago
782574c73d
Jenkins自动合并
6 years ago
29220002b1
Wms动态搜索与自定义列表，表单开发
6 years ago
56e53906ec
Jenkins自动合并
6 years ago
cf92fb2b23
Wms动态搜索与自定义列表，表单开发
6 years ago
536200cf2b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2f2f24356c
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
daf3365ce3
Wms初始化扫描实体字段新增逻辑优化
6 years ago
d05fd542b3
2020-01-08添加列表菜单与对应和关系逻辑
6 years ago
b9f3ea144f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bca93691ba
2020-01-08添加列表菜单与对应和关系逻辑
6 years ago
7d4ba10449
Wms初始化扫描实体字段新增逻辑优化
6 years ago
852be5a130
Jenkins自动合并
6 years ago
76b5087e60
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f323637c94
Wms初始化扫描实体字段新增逻辑优化
6 years ago
b0bbf43a9b
Jenkins自动合并
6 years ago
b0f60a9176
2020-01-08创建动态列表与查询model
6 years ago
a685cd208d
Jenkins自动合并
6 years ago
fe809e2eff
定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错
6 years ago
adb4bd2a1c
Merge branch 'dev' into test
6 years ago
7594b3d515
SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消
6 years ago
a104276c01
Jenkins自动合并
6 years ago
b0b671aac0
软适配 数据源适配器优化
6 years ago
569c2613fe
Merge branch 'dev' into test
6 years ago
391d4005ad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f768247c4f
代码合并 2019-12-30 15:59:52
6 years ago
d32900413a
Jenkins自动合并
6 years ago
8143afeea9
拣货：条码的数量不能小于0+定时处理遗漏的待处理移动单JOB+closeTaskDetails函数还需要软删单据明细的状态
6 years ago
3b7b374b23
自定报表对象模型调整
6 years ago
王杰
7287aaeb77
其他组未提交的代码
6 years ago
20ccf65c5c
资源加载优化
6 years ago
4e8ee475b4
Jenkins自动合并
6 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
6 years ago
fc9b8629ab
【采购收货】
6 years ago
cc45dbc2cb
Jenkins自动合并
6 years ago
曾贞一
393d3f12b8
【7055 新增波次拣货流程】
6 years ago
王杰
ab68895760
test分支修改pom
6 years ago
王杰
c87b00756f
dev分支修改pom
6 years ago
a7d1ec785b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fdfc5884c5
【 库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】
6 years ago
78d80f03cf
Jenkins自动合并
6 years ago
15d3d3b5e1
【 库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】
6 years ago
34b843bd1f
Jenkins自动合并
6 years ago
曾贞一
f800d3dd7b
【成品发运，获取在途库位逻辑修改】
6 years ago
e062055661
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4632c7572c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3dd247491a
软件适配器异常信息优化
6 years ago
2a3499de65
Merge branch 'dev' into test
6 years ago
6d357abe9f
task `1304` 2 活化开线管控
6 years ago
0dfb948810
Merge branch 'dev' into test
6 years ago
fc663ee283
作业流程导入导出BUG#6189
6 years ago
056dbaacf2
Merge branch 'dev' into test
6 years ago
5b7f268b91
1274 修改组件普遍问题
6 years ago
686cd3dbfa
【#1240 KT-发运看板】前端对接调整
6 years ago
王杰
4911d184e0
更新 'modules/i3plus-pojo-model/pom.xml'
6 years ago
王杰
cfa54aa2b6
修改pom
6 years ago
d2591b419b
Jenkins自动合并
6 years ago
fa8a88c6d0
流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中
6 years ago
66c59fb8ff
Jenkins自动合并
6 years ago
d05a858bd1
6565 修改fastdfs配置，工位监控显示完成数量
6 years ago
d0e6d30a9e
#6639 【VDA生产领料-FIFO跳过-系统异常】
6 years ago
42a6f8a02d
【#1219 在宁德现有生产扣减JOB基础上增加生成领料单功能】
6 years ago
王杰
73b1e827d6
Merge branch 'dev' into test
6 years ago
48e136c4aa
任务列表展示创建人
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
曾贞一
ff1f561b9d
消息样式实体类 增加一条
6 years ago
王杰
ac5432bebb
解决冲突
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
c0d8375d0f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
8d6a2b53b1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b7c6189308
生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%）
6 years ago
王杰
64d631c180
Merge branch 'test'
6 years ago
f95482501b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
410558d43c
Merge branch 'test'
6 years ago
7cb9ffd37b
Lac细节优化
...
OPC调整
6 years ago
3fa5437c5a
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
360f908ae4
获取生产数据 6283
6 years ago
208410340e
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
6871e96496
Merge branch 'dev' into test
6 years ago
5dc8ffb394
日志处理队列V1.0
6 years ago
c4d7a2380c
Merge branch 'test'
6 years ago
9755e5f751
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
da7ba77dab
LAC 跨服务调用软适配接口完成
6 years ago
王杰
d2c7a81893
Merge branch 'dev' into test
6 years ago
154bba4b3b
LAC 调度模式优化
6 years ago
王杰
2417b40635
Merge branch 'dev' into test
6 years ago
cfd7f5276e
实体调整
6 years ago
9c54b2561c
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
50bf9300ba
LAC 调度模式完成
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
王杰
9446a76159
Merge branch 'dev' into test
6 years ago
aeff042046
添加 组织代码查询
6 years ago
c79786a677
合并开发分支的代码POM文件被改成DEV修改回TEST
6 years ago
18161e8191
Merge branch 'test'
6 years ago
3dbbee3c60
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3bc277178e
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
3e9cc95017
pojo-model加入andon-pojo依赖
6 years ago
2906667856
mes定时获取安灯安灯任务信息
6 years ago
b47f97fa05
1050-2 工位监控
6 years ago
77fefbcf74
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
5956d5a08e
冲销：需求变更优化
6 years ago
15e812c7a6
Merge branch 'test'
6 years ago
02055a8b7e
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
18789939b0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0526da8ee3
Merge branch 'test'
6 years ago
cd74f5336f
Merge branch 'dev' into test
6 years ago
689f6057c1
添加查询账号接口
6 years ago
febbea09c3
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
69e8357c69
条码数量编辑
6 years ago
a1597c089c
成品冲销+导入转换格式（就一个不知道是什么单导入）
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
4809b8bc83
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
16839f6911
成品冲销+抛异常方法封装优化
6 years ago
413266293e
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
56d7457826
工位监控提交
6 years ago
7863325afd
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
6 years ago
b7b78b85ac
误拉了test分支的代码：还原
6 years ago
52a5fe74af
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d9dd10761e
WebService 欧洲对接完成
6 years ago
袁津哲
wynne1005
钮海涛
wei.peng
宋军超
王杰
汪云昊
qianhs
曾贞一
许心洁
陈思洁
puxiao.liao
贾文涛
luweihao
jenkins
gcj
jokelone
E
crish
张哲铭
刘辉