wei.peng
|
279ec2d1fe
|
授权加密问题修复
|
5 years ago |
袁津哲
|
b23915236b
|
开发根据实体动态生成数据库文档页面功能
|
5 years ago |
 曾贞一
|
f3e53ff1eb
|
【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
|
5 years ago |
|
wei.peng
|
effae233bf
|
对象历史记录 Pojo 创建
|
5 years ago |
|
wei.peng
|
fe46d8da29
|
1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
|
5 years ago |
wynne1005
|
109c4429ce
|
还原dev pom
|
5 years ago |
|
袁津哲
|
9518628c12
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
533d8e55e8
|
开发导入模块功能
|
5 years ago |
汪云昊
|
ccf2f42840
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
edf0b66115
|
Sonar代码缺陷修复
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
|
5 years ago |
陈思洁
|
5d8fec4938
|
合并冲突
|
5 years ago |
|
陈思洁
|
7505087392
|
【mes 产品配方导入功能和基础数据维护】
|
5 years ago |
 钮海涛
|
100d8b0019
|
Merge branch 'test' into dev
|
5 years ago |
|
汪云昊
|
34c77d6944
|
ICS 注册中心监控接口，Actuator对外端口调整
|
5 years ago |
puxiao.liao
|
a2f7c3426e
|
bug7994【7994 麦格纳收货需求差异】
|
5 years ago |
|
汪云昊
|
1051b22575
|
ICS 注册中心监控对象
|
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 |
|
汪云昊
|
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 |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
wei.peng
|
1d00303306
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
5 years ago |
|
钮海涛
|
82d5332861
|
修复POM文件问题
|
5 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
5 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
5 years ago |
|
wynne1005
|
44696061ee
|
修改pom文件为最新
|
5 years ago |
|
wei.peng
|
c8c7c73336
|
自定义报表 布局,元素,报表 功能优化完成
|
5 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
5 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
5 years ago |
|
wynne1005
|
4b4bf4e433
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
许心洁
|
5bf7133ff1
|
动态查询：BUG#7845；BUG#7676；BUG#7675
|
5 years ago |
|
曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
5 years ago |
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
 王杰
|
999aae6fc0
|
解决冲突
|
5 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
5 years ago |
|
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
5 years ago |
|
钮海涛
|
669874cb9b
|
Merge branch 'dev' into test
|
5 years ago |
|
许心洁
|
1d90195de6
|
3D仓库
|
5 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
5 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
5 years ago |
|
许心洁
|
3d3f134d7f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
c9f6f336af
|
动态查询：解决了BUG#7658,7660,7661,7663,7664
3D仓库：联调优化逻辑
|
5 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
钮海涛
|
b323b2feae
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
luweihao
|
00252caa0c
|
移动mespcn公用model
|
5 years ago |
|
许心洁
|
cc98e84ba4
|
动态查询：增加开窗功能
|
5 years ago |
|
luweihao
|
f67dd06cd4
|
Merge branch 'dev' into test
|
5 years ago |
|
许心洁
|
b8d7feb413
|
动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解
+
字段无需区分工厂
|
5 years ago |
|
luweihao
|
66f7121975
|
Merge branch 'dev' into test
|
5 years ago |
|
许心洁
|
632ad62c45
|
动态查询：查询类名需作为动态入参
|
5 years ago |
|
luweihao
|
246dd85721
|
Merge branch 'dev' into test
|
5 years ago |
|
许心洁
|
55e3f212ce
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
7f161e3bae
|
3D可视化仓库
|
5 years ago |
jenkins
|
1ada447069
|
Jenkins自动合并
|
5 years ago |
|
puxiao.liao
|
53a2152ff1
|
【 7531 在网页的条码打印界面增加一个按钮，可以修改部分条码数量，修改条件，库位为空，库区有值，条码状态为待入库。此部分条码为日生产计划生成的条码。
】bug7531
|
5 years ago |
|
jenkins
|
24d834cd6d
|
Jenkins自动合并
|
5 years ago |
qianhs
|
e1114d67d2
|
【静态盘点解冻调差时，如果勾选了所有盘点单，现在需要一个单子一个单子点击确认调差，需要在点击时将所有盘点单的调差范围都显示出来，然后一次性调差所有功能】【bug7485】
|
5 years ago |
|
jenkins
|
335c725bca
|
Jenkins自动合并
|
5 years ago |
|
qianhs
|
4ccda48061
|
【 PDA所有流程中，扫描后默认提示的组件去除】【bug7409】
|
5 years ago |
|
jenkins
|
27b1f5ca21
|
Jenkins自动合并
|
5 years ago |
|
qianhs
|
22eaa30dab
|
【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】
|
5 years ago |
|
jenkins
|
a3823f4a16
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
2d30f2da0f
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
jenkins
|
d790bcf355
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
67ef5c5516
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
89a7cafee4
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
jenkins
|
33e68b7e9f
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
cb68f62e46
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
8a4974f369
|
自定义报表 调用调整
|
5 years ago |
|
jenkins
|
6371e8df60
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
f7c98e3982
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
jenkins
|
a19cace3b1
|
Jenkins自动合并
|
5 years ago |
|
puxiao.liao
|
b64327831a
|
【 7402 收货回执界面，查询条件增加一个ASN组号，显示列表中也增加一个ASN组号
】bug7402
|
5 years ago |
|
jenkins
|
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 |
|
jenkins
|
a0b67a3723
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
8285c87624
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
jenkins
|
782574c73d
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
29220002b1
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
jenkins
|
56e53906ec
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
cf92fb2b23
|
Wms动态搜索与自定义列表，表单开发
|
5 years ago |
|
汪云昊
|
536200cf2b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
袁津哲
|
2f2f24356c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
daf3365ce3
|
Wms初始化扫描实体字段新增逻辑优化
|
5 years ago |
宋军超
|
d05fd542b3
|
2020-01-08添加列表菜单与对应和关系逻辑
|
5 years ago |
|
宋军超
|
b9f3ea144f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
bca93691ba
|
2020-01-08添加列表菜单与对应和关系逻辑
|
5 years ago |
|
袁津哲
|
7d4ba10449
|
Wms初始化扫描实体字段新增逻辑优化
|
5 years ago |
|
jenkins
|
852be5a130
|
Jenkins自动合并
|
5 years ago |
|
袁津哲
|
76b5087e60
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
f323637c94
|
Wms初始化扫描实体字段新增逻辑优化
|
5 years ago |
|
jenkins
|
b0bbf43a9b
|
Jenkins自动合并
|
5 years ago |
|
宋军超
|
b0f60a9176
|
2020-01-08创建动态列表与查询model
|
5 years ago |
|
jenkins
|
a685cd208d
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
fe809e2eff
|
定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错
|
5 years ago |
|
WYnneaoapc
|
adb4bd2a1c
|
Merge branch 'dev' into test
|
5 years ago |
|
许心洁
|
7594b3d515
|
SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消
|
5 years ago |
|
jenkins
|
a104276c01
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
b0b671aac0
|
软适配 数据源适配器优化
|
5 years ago |
|
WYnneaoapc
|
569c2613fe
|
Merge branch 'dev' into test
|
5 years ago |
|
wei.peng
|
391d4005ad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
f768247c4f
|
代码合并 2019-12-30 15:59:52
|
5 years ago |
|
jenkins
|
d32900413a
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
8143afeea9
|
拣货：条码的数量不能小于0+定时处理遗漏的待处理移动单JOB+closeTaskDetails函数还需要软删单据明细的状态
|
5 years ago |
|
wei.peng
|
3b7b374b23
|
自定报表对象模型调整
|
5 years ago |
|
王杰
|
7287aaeb77
|
其他组未提交的代码
|
5 years ago |
|
汪云昊
|
20ccf65c5c
|
资源加载优化
|
5 years ago |
|
jenkins
|
4e8ee475b4
|
Jenkins自动合并
|
5 years ago |
gcj
|
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 |
|
gcj
|
fc9b8629ab
|
【采购收货】
|
5 years ago |
|
jenkins
|
cc45dbc2cb
|
Jenkins自动合并
|
5 years ago |
|
曾贞一
|
393d3f12b8
|
【7055 新增波次拣货流程】
|
5 years ago |
|
王杰
|
ab68895760
|
test分支修改pom
|
5 years ago |
|
王杰
|
c87b00756f
|
dev分支修改pom
|
5 years ago |
|
gcj
|
a7d1ec785b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
qianhs
|
fdfc5884c5
|
【 库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】
|
5 years ago |
|
jenkins
|
78d80f03cf
|
Jenkins自动合并
|
5 years ago |
|
qianhs
|
15d3d3b5e1
|
【 库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】
|
5 years ago |
|
jenkins
|
34b843bd1f
|
Jenkins自动合并
|
5 years ago |
|
曾贞一
|
f800d3dd7b
|
【成品发运，获取在途库位逻辑修改】
|
5 years ago |
|
汪云昊
|
e062055661
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
4632c7572c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
3dd247491a
|
软件适配器异常信息优化
|
5 years ago |
|
WYnneaoapc
|
2a3499de65
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
6d357abe9f
|
task `1304` 2 活化开线管控
|
5 years ago |
jokelone
|
0dfb948810
|
Merge branch 'dev' into test
|
5 years ago |
|
许心洁
|
fc663ee283
|
作业流程导入导出BUG#6189
|
5 years ago |
|
jokelone
|
056dbaacf2
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
5b7f268b91
|
1274 修改组件普遍问题
|
6 years ago |
E
|
686cd3dbfa
|
【#1240 KT-发运看板】前端对接调整
|
6 years ago |
|
王杰
|
4911d184e0
|
更新 'modules/i3plus-pojo-model/pom.xml'
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
jenkins
|
d2591b419b
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
fa8a88c6d0
|
流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中
|
6 years ago |
|
jenkins
|
66c59fb8ff
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
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 |
crish
|
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 |
|
jenkins
|
8eb8c2f97e
|
Merge branch 'master' of i3-IMPP/i3plus-pojo into test
|
6 years ago |