256 Commits (4fc72ca358135a97c1dfadc9a4e6137b90ab0d78)

Author SHA1 Message Date
lbwgithub 81d86d1bd2 条码模型 6 years ago
lbwgithub 9a21e2d99f 条码差异详情返回值 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
许心洁 8f7d3b371b 流程管家:回显给前端当前步骤参数类型 6 years ago
许心洁 49bdbacc2f 盘点差异回显样式需求(存储区:红色;库位,数量:黄色) 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
许心洁 750a216fd2 任务列表显示:添加创建时间和源存储区字段(盘点) 6 years ago
汪云昊 c10bf2e3e1 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 0b8bc114bc 服务端调整 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 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
jimmy.zeng 399a51b044 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 27d574314d getList未查到数据要判断+补全所有showInformation区分颜色 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