crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
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 |
WYnneaoapc
|
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 |
wei.peng
|
d9dd10761e
|
WebService 欧洲对接完成
|
6 years ago |
|
许心洁
|
8deff73454
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
f35461ef57
|
WebService Server 优化完成
|
6 years ago |
|
wei.peng
|
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 |
|
许心洁
|
d406532b37
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
1e5e35ee6f
|
Pojo 合并代码
|
6 years ago |
|
wei.peng
|
babaf2f7d6
|
WebService 客户端Xml参数调试成功
|
6 years ago |
|
汪云昊
|
f3867c64f4
|
软适配微服务接口
|
6 years ago |
|
wei.peng
|
61a38c9acd
|
WebService Server 优化完成
|
6 years ago |
|
crish
|
0924810e64
|
Merge branch 'test'
|
6 years ago |
 王杰
|
18bc35f60d
|
Merge branch 'dev' into test
|
6 years ago |
lbwgithub
|
c67fe92297
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
3e8bcbeb84
|
枚举
|
6 years ago |
|
WYnneaoapc
|
60f441e685
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
d495046dcf
|
添加XML 工具实现
|
6 years ago |
|
刘辉
|
60d1798b9c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
1e41ab2e39
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
汪云昊
|
bd55a18bf6
|
微服务接口 - 打印模板分页查询
|
6 years ago |
|
刘辉
|
1defd0d8be
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
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 |
|
许心洁
|
e35cf183da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
lbwgithub
|
81d86d1bd2
|
条码模型
|
6 years ago |
|
许心洁
|
7a403a37da
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
bleakney.liu
|
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 |
|
lbwgithub
|
9a21e2d99f
|
条码差异详情返回值
|
6 years ago |
jenkins
|
7e3edd06a0
|
Merge branch 'dev' into test
|
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 |
|
wei.peng
|
4e303413ff
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
c0fc2c36bf
|
Socket 适配器完成
MQ 适配器完成
|
6 years ago |
|
crish
|
9ae6ee5016
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
d5349806c9
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
8f7d3b371b
|
流程管家：回显给前端当前步骤参数类型
|
6 years ago |
|
jenkins
|
9e12bb5da3
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
49bdbacc2f
|
盘点差异回显样式需求（存储区：红色；库位，数量：黄色）
|
6 years ago |
|
WYnneaoapc
|
f96cbd1be3
|
Merge branch 'dev' into test
|
6 years ago |
|
lbwgithub
|
3ba7719160
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
31b32be60d
|
颜色状态
|
6 years ago |
|
jenkins
|
6250794847
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
750a216fd2
|
任务列表显示：添加创建时间和源存储区字段（盘点）
|
6 years ago |
|
jenkins
|
790c0b4ec6
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c10bf2e3e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
0b8bc114bc
|
服务端调整
|
6 years ago |
|
曾贞一
|
6c8cfd8678
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
|
wei.peng
|
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 |
于学杰
|
f6bb2ee21f
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
564deb4d6b
|
适配记录及数据库适配器
|
6 years ago |
|
jenkins
|
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 |
jimmy.zeng
|
d23045a667
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
a86f2e49c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
51974a46b9
|
WebService 调用发送邮件测试
|
6 years ago |
|
crish
|
35beb0c60e
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
40a2a789be
|
参数描述调整
|
6 years ago |
|
wei.peng
|
377a875fec
|
软适配客户端代码结构调整。
|
6 years ago |
|
wei.peng
|
1661e4e0a9
|
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
|
6 years ago |
|
wei.peng
|
fc1c7ab797
|
软适配添加-所有适配命令 接口
|
6 years ago |
|
汪云昊
|
8b0e851eb8
|
数据源适配套件相关接口
|
6 years ago |
|
wei.peng
|
2c6b223628
|
软适配客户端代码结构调整。
|
6 years ago |
|
汪云昊
|
21240ffa53
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
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 |
|
许心洁
|
262f7efe05
|
如果有异常信息需要叠加在提示信息前一起返回给前端
|
6 years ago |
|
汪云昊
|
f2e2dd1670
|
软件适配器 数据源适配器
单号生成高并发优化
|
6 years ago |
|
crish
|
bbfc9b320f
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
b899c5c8c5
|
软适配 WebService 功能接口开发
|
6 years ago |
|
wei.peng
|
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 |
|
汪云昊
|
029d7eac62
|
软适配model
|
6 years ago |
|
wei.peng
|
e58aaf95b9
|
软适配 WebService 功能开发
|
6 years ago |
|
jimmy.zeng
|
73b6088977
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
65b336f708
|
任务993+生产报工产生的移动明细单位错误BUG修复+PDA颜色回显完成的明细颜色没有与处理中的区分开BUG修复
|
6 years ago |
|
曾贞一
|
ceac2db551
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
399a51b044
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
27d574314d
|
getList未查到数据要判断+补全所有showInformation区分颜色
|
6 years ago |
|
曾贞一
|
ae12af551b
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
96a29d3de8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
18dac2b569
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy.zeng
|
1b06c1d07f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
2325d18660
|
软件适配器 认证参数接口
|
6 years ago |
|
许心洁
|
9de4d79009
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
d2036fd841
|
任务961，962，966，973
|
6 years ago |
|
曾贞一
|
25e7ca08d3
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
crish
|
f7b366fe29
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
12a2a27b18
|
mes， pcn条码打印
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
wei.peng
|
f6b49bf31a
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
9bea065f35
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
b10b967b73
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
884f3e1a96
|
合并代码
|
6 years ago |
|
wei.peng
|
d7b0f30d91
|
IMPP 平台功能功能优化 . 软适适配功能开发
|
6 years ago |
|
jimmy.zeng
|
d340133e7a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
cb49d8d848
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
ffb6f8a17c
|
任务列表不分页，主要查询字段加索引
|
6 years ago |
|
jimmy.zeng
|
a2a4dc6beb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
e83efe76e0
|
软件适配器 测试
|
6 years ago |
|
汪云昊
|
b9d9d7402e
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
94924cb264
|
POJO 合并
|
6 years ago |
|
wei.peng
|
718ec36747
|
POJO 合并
|
6 years ago |
|
jimmy.zeng
|
7002ac5a8a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
f5c0ca9383
|
软适配模型调整
|
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 |
|
许心洁
|
f6c425c649
|
平台获取设备ID方式改变+所有pojo加上序列化
|
6 years ago |
|
许心洁
|
af7b2404dd
|
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
peter.pan
|
363d521c36
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
d45b7b77f3
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
651577d5ad
|
model字段修改（dragon）
|
6 years ago |
|
许心洁
|
bb8078cb94
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
bda52f76c6
|
软适配 Json 请求适配完成
|
6 years ago |
|
许心洁
|
60e6d51d35
|
流程管家2.0
|
6 years ago |
|
peter.pan
|
19871c5f27
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
8f977719c0
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
b5c204f873
|
软适配接口制作完成
|
6 years ago |
|
于学杰
|
6598a829e0
|
Merge branch 'dev'
|
6 years ago |
jenkins
|
409cbb8492
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
4a717ec544
|
直送发运JOB+交易处理程序（下线结算）逻辑变动
|
6 years ago |
|
jenkins
|
49a936c660
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
7f1ef0bca7
|
自定义报表表单打通， 用户在线设置功能优化
|
6 years ago |
|
wei.peng
|
90048c3f0a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
4f553c0857
|
添加序列化ID , 用户登录在线机制完成
|
6 years ago |
|
peter.pan
|
1b10c4ee63
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
32a563e053
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
dcb9b59ec9
|
新增一个实体封装
|
6 years ago |
|
peter.pan
|
c02d22ecba
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
543171dfbb
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1ac5542541
|
动态表单分页功能完成
|
6 years ago |
|
peter.pan
|
c436c8ee3d
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
96264870c2
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
bf02cbf8a4
|
PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
|
6 years ago |
|
peter.pan
|
d39c16c5d5
|
Merge branch 'test'
|
6 years ago |
|
wei.peng
|
1ee9cb24f2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
peter.pan
|
7861048e31
|
Merge branch 'test'
|
6 years ago |
|
汪云昊
|
a7bfc692fe
|
EXCEL数据通用导出
|
6 years ago |
jenkins
|
470d319504
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
ee440bc487
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
6c7bd177ca
|
文件上传微服务接口优化
excel通用导出优化
任务提示优化
|
6 years ago |
|
peter.pan
|
176f9ffd5f
|
Merge branch 'test'
|
6 years ago |
|
于学杰
|
713503d7ff
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
e3d5e5bb19
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
|
wei.peng
|
33ec897657
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
wei.peng
|
734340fe63
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
6259bd56bc
|
通用EXCEl导出MODEL
|
6 years ago |
|
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jenkins
|
25fc477991
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
e9b1d7e595
|
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
|
6 years ago |
|
jenkins
|
511df468ec
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
13af329513
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
|
jenkins
|
a58888df85
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
db461a76ba
|
增加动态报表对外接口-多条件删除
移除默认属性校验
移除查询数据库所有表的部分字段（部分字段SQLServer不支持）
|
6 years ago |
|
wei.peng
|
c4dceace92
|
增加动态报表对外接口-批量修改
|
6 years ago |
|
jenkins
|
878108e86f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
3630f0c2f1
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
jenkins
|
1a7cda72d3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
aec4b9a85a
|
自定义表单 多数据源 功能完成
|
6 years ago |
|
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
yiming.gu
|
ef09b0f41b
|
model取消对mes、andon的引用
|
6 years ago |
allen.zhang
|
8afe54af50
|
Merge branch 'dev' into test
|
6 years ago |
|
yiming.gu
|
85c4f94dcb
|
MES model转移至pojo-mes目录下
|
6 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
alwaysfrin
|
41a8adcea2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
309f3f2282
|
事务调整及demo
|
6 years ago |
|
许心洁
|
8e2e1f6543
|
MES：流程配置添加工序，工步基础数据接口
|
6 years ago |
|
jenkins
|
21d3c053ca
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
b5696a63f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
e79987d235
|
MES流程配置接口（流程，产品流程配置）
|
6 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yiming.gu
|
2eb732c7df
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
|
6 years ago |
|
yiming.gu
|
7c647c7844
|
1、班次pojo修改
2、andon项目新增组织模型基础数据
|
6 years ago |
|
许心洁
|
7cce6b828f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
9a4323614c
|
流程新增与流程设计分开
|
6 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
6 years ago |
Silliter
|
dbfae39ea6
|
安灯项目优化
|
6 years ago |
|
Silliter
|
c9c470a27f
|
开发物理安灯业务
|
6 years ago |
|
Silliter
|
47bd2c0aa7
|
安灯项目开发
|
6 years ago |
|
yiming.gu
|
15b5edfaec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
b1f513d786
|
新增设备pojo，组织模型model
|
6 years ago |
|
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
6 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
6 years ago |
|
Silliter
|
4e9a8ab787
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
35690ce138
|
作业流程界面+后端分页查询接口
|
6 years ago |
|
jenkins
|
12e2f1d1b8
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
19f30ce4f9
|
流程配置+定时处理错误移动单给错误信息赋值过长
|
6 years ago |
|
jenkins
|
850b372ab4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
0aaa8112a8
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
|
jenkins
|
068c4d0ad3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
51c5e36838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b17b15964f
|
交易处理主程序调用组件异常处理优化
|
6 years ago |
|
jenkins
|
461118dde2
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
bb922f42fb
|
配置文件调整
|
6 years ago |
|
jenkins
|
fb4be4580d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
gragon.xu
|
4309aeb997
|
d
|
6 years ago |
|
gragon.xu
|
e7071ad41c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
186a9ccb0d
|
监控台
|
6 years ago |
|
jenkins
|
15d53b47ec
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
afac75bb2b
|
质检明细删除问题修改
看板卡新的moveno生成问题
任务操作问题
校验库容问题
|
6 years ago |
|
Silliter
|
83ce4f0efb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
588a517ae1
|
任务列表接口优化
|
6 years ago |
|
wei.peng
|
c119c06130
|
自定义表单 使用Redis 1.0 功能完成
|
6 years ago |
|
Silliter
|
28e43c087b
|
合并dev分支代码
|
6 years ago |
柯裕
|
3cbc5c4d99
|
添加model
|
6 years ago |
|
wei.peng
|
97e992f05f
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
|
Silliter
|
65b388d048
|
合并dev分支代码
|
6 years ago |
|
wei.peng
|
120ea87da8
|
动态接口集成 Bug修复
|
6 years ago |
|
Silliter
|
b198b38b43
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
3b47469aad
|
表单功能Model 封装完成
|
6 years ago |
|
Silliter
|
df714efc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
fd0f3ca00e
|
自定义表单数据接口，模型分装完成
|
6 years ago |
|
wei.peng
|
15901e3fe1
|
自定义表单拦截器开发1.0完成
|
6 years ago |
|
Silliter
|
451b70acad
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
0da89fa17e
|
表单-布局新增行列设置初始数据
SWEB通知附件调整
定时任务日志添加所属模块
消息设置所属模块
消息微服务调用方法调整
|
6 years ago |
|
Silliter
|
5a1a84f10f
|
流程管家新增日志bug修改
|
6 years ago |
|
Silliter
|
4f31301ea1
|
流程管家收货业务优化
|
6 years ago |
|
Silliter
|
ba3a542934
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
8684d95c1e
|
优化代码
|
6 years ago |
jiajack
|
3a5f43f97b
|
删除iml文件
|
6 years ago |
|
Silliter
|
c90dca9b05
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
5b0d4f8d37
|
元素增删改查 DAO层接口完成
|
6 years ago |
|
Silliter
|
92c5457521
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
6c1316f262
|
合并代码
|
6 years ago |
|
wei.peng
|
ccce8c009c
|
级联功能接口完成
|
6 years ago |
|
Silliter
|
fe644066af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
1b97e377f2
|
pojo引入jar包
|
6 years ago |
|
wei.peng
|
04ed151d45
|
元素管理接口完成(未测试)
|
6 years ago |
|
wei.peng
|
93f4745afd
|
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
# pom.xml
|
6 years ago |
|
wei.peng
|
045c68ee2e
|
数据对象管理接口开发完成
|
6 years ago |
|
yunhao.wang
|
0171439464
|
版本发布 2019年3月26日22:47:53
|
6 years ago |
|
Silliter
|
dbeb965e9b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
e4adb35413
|
自定义表单 数据对象 新增接口完成
|
6 years ago |
|
wei.peng
|
e4a3b95f16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1049a11576
|
自定义表单 数据对象 新增接口完成
|
6 years ago |
|
Silliter
|
ec50aef781
|
开发单据打印
|
6 years ago |
|
wei.peng
|
f039095f83
|
数据对象实体更新
创建数据对象 Model
|
6 years ago |
|
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
ea2eb6103d
|
优化调整
|
6 years ago |
|
Silliter
|
b1f195a185
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
738db8d837
|
条码打印开发，角色微服务提供
|
6 years ago |
|
Silliter
|
618ce5d560
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
c4ef1e66f3
|
开发条码打印后端
|
6 years ago |
|
wei.peng
|
8ec8dba414
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
05efe333cc
|
开发打印模板功能
|
6 years ago |
|
Silliter
|
cc4484a562
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
柯裕
|
398a3d98c5
|
更新POJO
|
6 years ago |
|
柯裕
|
e3ae013868
|
更新POJO
|
6 years ago |
|
柯裕
|
ce9cbe1198
|
更新pojo
|
6 years ago |
|
Silliter
|
ba90dfb123
|
开发交易处理主程序
|
6 years ago |
|
Silliter
|
b0d34a04b4
|
调整model实体
|
6 years ago |
|
Silliter
|
e80d476902
|
调整model实体
|
6 years ago |
|
Silliter
|
3faba3bbc2
|
实体调整
|
6 years ago |
|
wei.peng
|
a2bbd4b5f0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
c61d0882c5
|
模板管理生成HTML 完成
|
6 years ago |
|
wei.peng
|
ae08c3ef76
|
模板管理 后台功能完成
|
6 years ago |
|
wei.peng
|
19a8189b05
|
模板管理 后台功能完成
|
6 years ago |
|
wei.peng
|
2bd16137bd
|
模板管理 后台功能完成
|
6 years ago |
|
wei.peng
|
1e43b2e36f
|
模板Pojo 调整
|
6 years ago |
|
wei.peng
|
324c7aa413
|
自定义报表 目录功能 联调完成
|
6 years ago |
|
yunhao.wang
|
7d4f3ebb67
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
79ad222295
|
用户密码加密侧率功能完成
|
6 years ago |
|
Silliter
|
c45091584c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
b8a1196a45
|
添加自定义组件
|
6 years ago |
|
Silliter
|
a4d59caaeb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
b55906ced0
|
生产领料优化
|
6 years ago |
|
wei.peng
|
0550adce28
|
用户管理更新
|
6 years ago |
|
Silliter
|
cc3bb9e9ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
3750b11b88
|
用户管理更新
|
6 years ago |
|
柯裕
|
1df72e1d4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
93ff5ad071
|
移动条码对象封装
|
6 years ago |
|
amy
|
f456ff2f75
|
入库上架扫描条码
|
6 years ago |
|
wei.peng
|
9b1acb4b8f
|
Merge branch 'dev' into test
|
6 years ago |
|
柯裕
|
0a8ffd10ec
|
组件优化
|
6 years ago |
|
yunhao.wang
|
7b2d7f78dd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
cfd1a26b36
|
流程管家业务优化
|
6 years ago |
|
yunhao.wang
|
8cb5c2ee1a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
柯裕
|
44367c9240
|
组件条件封装
|
6 years ago |
|
Silliter
|
faf1c1318f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
fba7c1a6da
|
添加 isChecked
|
6 years ago |
|
wei.peng
|
47105866be
|
合并代码 解决冲突
|
6 years ago |
|
wei.peng
|
3d89bae88f
|
动态 Table 功能优化
|
7 years ago |
|
wei.peng
|
adbcbb16a0
|
动态 Table 功能优化
|
7 years ago |
|
wei.peng
|
786c652900
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
95a58d97a2
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
bd3ab06440
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
wei.peng
|
35ecf85881
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
47dd4c68b5
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
0d7e773a49
|
动态表单 基础功能完成
|
7 years ago |
|
wei.peng
|
2ad41030e6
|
合并代码 并打开 MQ 以及邮箱
|
7 years ago |
|
wei.peng
|
9eb7122e99
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
cb95d0a713
|
项目pom版本更新为test
|
7 years ago |
|
Silliter
|
1b54063b56
|
优化代码
|
7 years ago |
|
amy
|
7706f19445
|
抽点model创建
|
7 years ago |
|
Silliter
|
62dcedc133
|
解决冲突
|
7 years ago |
|
Silliter
|
bfc1d5ba2b
|
解决冲突
|
7 years ago |
|
wei.peng
|
855d9abef8
|
1、复杂树 功能完成
|
7 years ago |
|
wei.peng
|
703fa5158a
|
用户增删改功能开发
|
7 years ago |
|
wei.peng
|
1efbeb3d5f
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
wei.peng
|
f20d8cab3d
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
wei.peng
|
7b080b6a3a
|
删除target 文件夹 或者删除.iml 文件
|
7 years ago |
|
alwaysfrin
|
00f95dda13
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class
|
7 years ago |
|
alwaysfrin
|
883c31288b
|
ignore整理
|
7 years ago |
|
wei.peng
|
cdb48374ac
|
移除iml文件的版本控制
|
7 years ago |
|
wei.peng
|
9121cafcff
|
移除iml文件的版本控制
|
7 years ago |
|
alwaysfrin
|
231efdcf13
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
daf65deb32
|
国家化封装
|
7 years ago |
|
alwaysfrin
|
336f808d58
|
主键Long型转换json时调整为String
|
7 years ago |
|
wei.peng
|
aaa0a1b21b
|
初始化系统配置
|
7 years ago |
|
alwaysfrin
|
74483040b3
|
impp核心功能初始化
|
7 years ago |
|
alwaysfrin
|
a208e592bd
|
基础对象初始化
|
7 years ago |