3153 Commits (e35cf183da81211ef75e4c870f944598f3f5a125)

Author SHA1 Message Date
刘敏 d8bc8d713d 条码打印model字段添加 6 years ago
wei.peng 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
汪云昊 c6badc59c6 适配记录添加id参数 6 years ago
wei.peng c7ed8613d6 软适配添加WebService 默认处理 6 years ago
汪云昊 83f400a36b sql 注入 删除斜杠 6 years ago
crish b31162c5d6 安灯工位放行, 安灯任务管理界面数据权限控制
Signed-off-by: crish <570360737@qq.com>
6 years ago
bleakney.liu 2c146d39bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
bleakney.liu e52c310d38 add 入库pojo 和response 6 years ago
jimmy.zeng 4bfa05698f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
曾贞一 9e2169fa87 推荐入库 组件开发 6 years ago
曾贞一 15d399e4c7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 512ebb495c VDA收货 提交组件 6 years ago
wei.peng 6cbcea7c2c 系统菜单默认排序值改动 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
汪云昊 baa23aab03 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 23c59d4326 Merge branch 'dev' into test 6 years ago
汪云昊 564deb4d6b 适配记录及数据库适配器 6 years ago
WYnneaoapc 271a26d2b8 提交 6 years ago
jenkins 26179650f0 Merge branch 'dev' into test 6 years ago
许心洁 787f12387d 流程管家:关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理 6 years ago
jenkins 9033584a52 Merge branch 'dev' into test 6 years ago
钮海涛 70868503d4 add beans services controllers to aps 6 years ago
jenkins bca4f7745f Merge branch 'dev' into test 6 years ago
许心洁 90b731fde4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 de6792426e 流程管家:单据完成提交所有待提交移动单;只推送当前移动单
PDA收货组件:改数后删除历史记录BUG修复
6 years ago
wei.peng 33473f9903 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc f51ba09666 提交 6 years ago
钮海涛 30ecc48007 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
钮海涛 3c907fe88a add material bean to aps 6 years ago
crish 989cbbdee8 安灯目录结构调整
Signed-off-by: crish <570360737@qq.com>
6 years ago
wei.peng 4ca0851386 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
曾贞一 d509e5755a vda 收货超收处理 6 years ago
jenkins 603647bc82 Merge branch 'dev' into test 6 years ago
曾贞一 c5f43236a3 开口合同与po关系 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
汪云昊 6093ec0621 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 f6c1eff0f1 excel通用导入优化 6 years ago
于学杰 54db1929b1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 05dc432c57 1. 增加关联单位和关联数量字段 6 years ago
汪云昊 d120b1615a 国际化工具类 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
汪云昊 c27449a185 异常信息国际化 6 years ago
王杰 f5164d82fb 通用查询方法 6 years ago
jimmy.zeng bd466610d5 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
刘敏 72fec8146d 修改 6 years ago
jimmy.zeng b5eb716a4e Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
钮海涛 46bde2804d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
钮海涛 6008478aec add customer field function 6 years ago
jimmy.zeng 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
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
许心洁 59569cef66 移动单主表去掉乐观锁(处理错误移动单JOB一个事务内对一个表进行了两次操作不行,导致程序直接挂掉,事务也没回滚)+
交易处理组件(出入移库):待入库的可能是不合格的+
公共PDA组件抛异常获取值为空
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
汪云昊 ca7d5a2896 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 8b0e851eb8 数据源适配套件相关接口 6 years ago
wei.peng 2c6b223628 软适配客户端代码结构调整。 6 years ago
陈思洁 02270ea6e8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 f5d2398e0e VDA收货--开口合同增加字段
供应商增加字段
6 years ago
于学杰 01c58e8653 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 3454712bd2 1. 增加库存快照的类文件 6 years ago
汪云昊 873f91a2eb Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 f718a5dac5 excel通用导入优化 6 years ago
刘敏 f777c82ea7 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
刘敏 5b7ac2c344 ASN字段修改 6 years ago
wei.peng 212cfb02af Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 71798e9f51 软适配功能配置优化 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
许心洁 e8b9f58f43 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 262f7efe05 如果有异常信息需要叠加在提示信息前一起返回给前端 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
wei.peng 21241e45ca 软适配功能配置优化 6 years ago
王杰 58d6305bd3 mes动作 6 years ago
刘敏 c7734b7e26 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 5144d15ac4 采购单报表开发 6 years ago
crish 4a1ad40dfa Merge branch 'dev' into test 6 years ago
crish 726600fccd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish f205373964 安灯事件报表安灯类型导出
Signed-off-by: crish <570360737@qq.com>
6 years ago
许心洁 03ef38f853 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 315787197a 交易处理组件(收货):免检写入收货事务取目的库位的值+乐观锁去掉临时属性 6 years ago
曾贞一 b5dfa7dbd2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 8d6e4fdfa5 盘点实盘导入功能 6 years ago
陈思洁 677632748d VDA收货逻辑组件修改--修改sql中增加库存地字段显示 6 years ago
刘敏 4c39e84094 asn主表添加 6 years ago
wei.peng ca28ae6cad Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 0ac5232eb0 自定义表单 默认值取值方式修改 6 years ago
wei.peng b899c5c8c5 软适配 WebService 功能接口开发 6 years ago
王杰 c950019077 pcn定时任务 6 years ago
陈思洁 3b174fc782 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 f63cd5071b 新增开口合同实体 6 years ago
许心洁 8fc5788f64 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
wei.peng 9ec5e63da6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 5b200f824f 软适配 WebService 功能开发 6 years ago
汪云昊 3eef8ea750 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 029d7eac62 软适配model 6 years ago
许心洁 a959964950 移动单三张表加上乐观锁 6 years ago
crish 39e0fbca80 Merge branch 'dev' into test 6 years ago
crish 3266c9b1e0 安灯状态导出
Signed-off-by: crish <570360737@qq.com>
6 years ago
wei.peng e58aaf95b9 软适配 WebService 功能开发 6 years ago
jimmy.zeng 2d376575a3 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
陈思洁 3c6d17a283 修改pojo数据类型 6 years ago
jimmy.zeng ccffe9b7bd Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
曾贞一 229587fcf3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 ceced4c4b6 欧洲项目 检查数量 批次格式组件编写 6 years ago
WYnneaoapc c44a99eb40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 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
crish 8d8752b8b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 89b0a4a68a 条码打印调试
Signed-off-by: crish <570360737@qq.com>
6 years ago
刘敏 f0fba5e23a 盘点枚举添加--excel导出 6 years ago
刘敏 b3b913d768 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 8ac4f214b3 #5596 6 years ago
王杰 fe455a7147 pcn离线登陆 6 years ago
jimmy.zeng 836b0e933e Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
曾贞一 09aab6d87a 盘点添加 存储区多个查询 6 years ago
jimmy.zeng a4725e20c6 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng a59f95080c 自定义表单-同步对象功能优化
自定义表单-动态页面数据导出
6 years ago
曾贞一 a12a008713 盘点库位添加查询条件 6 years ago
曾贞一 b7bd96fa44 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc 546d9dc7a5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 61ed3d821d 提交 0905 6 years ago
曾贞一 d4007f6ca5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 64aed1f49c 开发 Restful 接口测试PDA 6 years ago
jimmy.zeng fd76f08af4 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 d2995520d4 mes-pcn定时任务增加字段 6 years ago
曾贞一 8b9a4fb109 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 575aa6ea2f 库存移动单报表 添加修改人,修改时间的查询条件和列表 6 years ago
刘敏 20bd7994a3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 e4cf678000 构造新增字段 6 years ago
WYnneaoapc 4b982fc4fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 1332f11a23 提交 6 years ago
jimmy.zeng 8f1ac3fdae Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish f370f377d4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 7ce78b170f 工作参数枚举
Signed-off-by: crish <570360737@qq.com>
6 years ago
刘敏 c05b22668f 字段修改 6 years ago
jimmy.zeng 835245f8f4 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
刘敏 2108a7f8e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 4852a4754c 字段枚举值添加 6 years ago
crish 65cb39d7ba 工作中心代码修改
Signed-off-by: crish <570360737@qq.com>
6 years ago
许心洁 7da95b1ad2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 876571e877 任务:994;BUG:5498 6 years ago
jimmy.zeng 0a3339ba8d Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
刘敏 67b1e5d4f6 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
刘敏 ff462900b7 枚举描述添加 6 years ago
jimmy.zeng 6e48f0a677 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
曾贞一 d8568e6d22 盘点优化代码。 6 years ago
曾贞一 5290ba6f63 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 01cb76da6d 指令移库 根据目标存储区扫描库位 6 years ago
刘敏 836f1bf870 字段修改 6 years ago
陈思洁 2af903f029 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 254f08da32 物料描述修改 6 years ago
jimmy.zeng 2e8a70d8b4 pom版本还原--pojo 6 years ago
刘敏 5fb7ffc40b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 0faeaa6047 导出枚举添加 6 years ago
王杰 482159b322 mes-pcn定时任务枚举修改 6 years ago
刘敏 193eba75d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 5b735fe3a2 移动单枚举导出 6 years ago
许心洁 71b6c64ed0 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
刘敏 3b86092577 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 5f539afd6d 移动单明细注解添加 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
crish a5b01bbaae Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 69d2932ca4 http请求增加不需要设置请求内容枚举
Signed-off-by: crish <570360737@qq.com>
6 years ago
许心洁 fe793f0431 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 3a1cf7a2b7 判断属性是否有final修饰 6 years ago
许心洁 d87cbd9c4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 b4b095c970 判断属性是否有final修饰 6 years ago
许心洁 5db4307fa5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
王杰 46d220f3ec mes条码规则校验 6 years ago
WYnneaoapc bb975b208b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc cbcdcabd82 测试修改提交 6 years ago
许心洁 84ace781a3 流程添加默认值方式错误 6 years ago
许心洁 503b68a0a5 拉了测试的代码POM文件错乱 6 years ago
许心洁 6068ca9fd8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 7d19c1bbed Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 cafd923d3a 流程管家:添加作业记录明细(作业记录不再更新移动单号:一个步骤记录一个作业记录明细) 6 years ago
许心洁 706ddcbba7 流程新增初始化组件明细组件赋默认值0 6 years ago