I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,144 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c974cf1450'
${ noResults }
Commit Graph

3019 Commits (c974cf1450b2d51f7de5e76520f0d173b72882f4)

Author SHA1 Message Date
刘敏 7a935276a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 bc953bb2c8 查询条件封装 6 years ago
刘敏 de381d438a 领料单模板创建 6 years ago
crish 3711873c29 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc c34a369e93 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 9d70008912 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 61ce4d1b3f 优化 6 years ago
WYnneaoapc ef1450e912 Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 6 years ago
crish 6c37a60ff4 MES-PCN获取平台打印数据 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
陈思洁 e9c596adce 盘点hql排序修改 6 years ago
陈思洁 4573b09392 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 2058789438 盘点业务修改bug 6 years ago
wei.peng 94924cb264 POJO 合并 6 years ago
wei.peng 718ec36747 POJO 合并 6 years ago
wei.peng 41aff3b560 `` 6 years ago
汪云昊 619251474d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 f5c0ca9383 软适配模型调整 6 years ago
曾贞一 abf155ecd9 库存报表 创建人、创建时间添加 6 years ago
WYnneaoapc c05e3b13c6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 391d0129e1 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
WYnneaoapc 63d86a4b0d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc ecba29948f 816 add method 6 years ago
jimmy.zeng 221f05b175 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 69525fbaa9 表单菜单排序 6 years ago
刘敏 839c139222 库存移动条码报表优化 6 years ago
jimmy.zeng 235498b162 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
陈思洁 638d9cb1a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 9ff9c11c97 字段调整 6 years ago
jimmy.zeng b0d2812778 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 409c433b5c 添加字典分组 6 years ago
汪云昊 42f067b987 软适配参数接口 6 years ago
曾贞一 eb035aeaf6 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 cf5aded9d9 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 05b9298dec 软适配Repository初始化 6 years ago
曾贞一 cef48801df Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 a713e835fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 7455c6c640 软适配配置文件初始化 6 years ago
汪云昊 f82011cf5b 实体 6 years ago
汪云昊 1c98f0a3c4 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 dc78cf114f 实体 6 years ago
wei.peng aee54acafc Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 46c710e559 表单功能优化，虚拟属性连表查询，时间格式化对接 6 years ago
wei.peng 68e4b74e0a 平台权限系功能优化 6 years ago
wei.peng 6d99080069 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 ff52a412d4 库存初始化信息 6 years ago
陈思洁 2860edf722 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 b604c5d9a0 交易记录增加字段 6 years ago
许心洁 374c2bf76c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 92d4bf46ce #5255,#5039 6 years ago
jimmy.zeng c986f7b2a3 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 090efb787f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 9ee2901346 添加字典分组 
优化redis资源键
 6 years ago
wei.peng d04d441711 用户管理修改密码 Bug 修复 6 years ago
jimmy.zeng 78267a3a45 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc 0f99cb1027 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 66f49f3fdc 自定义表单功能调整 6 years ago
crish 5df9896258 维修， 报废， 系统配置， pcn节点基础数据接口 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
WYnneaoapc 66e20acfe9 0730 Add File Operation in ODS Module untested 6 years ago
曾贞一 7ca6e46e4b Merge branch 'dev' into test 6 years ago
crish 781a1d2333 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 6b442cda1c PCN接口开发， 数据同步配置 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
crish 76684b82c0 PCN接口开发， 数据同步配置 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
crish 0e444aa993 PCN接口开发， 数据同步配置 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
jimmy.zeng bf293d4758 生产报工时，原材料move单号写入关联移动单号中 6 years ago
刘敏 dacc203119 库存报表修改 6 years ago
曾贞一 380efb664e Merge branch 'dev' into test 6 years ago
刘敏 8034e9e505 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 da1c9af3d4 库存报表新增 6 years ago
曾贞一 f30a40520b Merge branch 'dev' into test 6 years ago
WYnneaoapc d826c47d5a 修改了mesEvent pojo 6 years ago
WYnneaoapc e0089ab800 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
于学杰 24da688384 Merge branch 'test' into dev 6 years ago
许心洁 b3f4e62a74 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process 6 years ago
刘敏 794d4b69d6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 145600a5d0 单据查询精准查询 6 years ago
许心洁 31313baec9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process 6 years ago
许心洁 f6c425c649 平台获取设备ID方式改变+所有pojo加上序列化 6 years ago
曾贞一 3db421b825 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 b3a0a71065 库存初始化信息 6 years ago
wei.peng 837d6ea567 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 476d943a69 流程管家：自定义按钮触发的时候不需要预先调用当前步骤的回显信息 6 years ago
wei.peng 5a6cd405b6 用户管理修改密码 Bug 修复 6 years ago
许心洁 40fc36ef18 流程管家优化：快速提交流程手动提交校验 6 years ago
许心洁 af7b2404dd Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process 6 years ago
许心洁 d8786d8132 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 9a2798ef48 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 a4f2a7c848 hql修改asn订单明细 6 years ago
曾贞一 fb07628555 Merge branch 'dev' into test 6 years ago
汪云昊 c1cff11c7c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
peter.pan 4d83030c51 Merge branch 'dev' into test 6 years ago
许心洁 6431417462 dragon 6 years ago
许心洁 fb0cc3446b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 737c485652 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
mes增加了一个方法
 6 years ago
WYnneaoapc 3dca11a963 add a hql 6 years ago
陈思洁 1037f55f7e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 30750923d1 字段修改类型 6 years ago
刘敏 871dbed84a 查询条件封装 6 years ago
peter.pan d45b7b77f3 Merge branch 'dev' into test 6 years ago
刘敏 05fdcb42d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 651577d5ad model字段修改（dragon） 6 years ago
曾贞一 f20c33b7f5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 898e1d39d4 盘点结果回传ERP，写入move_to_erp时做单位转换 
原材料扣减，单位转换
 6 years ago
WYnneaoapc 33a59fdb0f 0730 add esop pojo and respository 6 years ago
许心洁 bb8078cb94 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 7f3d902a30 流程管家：提交检验+预回显优化； 
直送发运JOB:#5132
 6 years ago
wei.peng 750e4d75dc 添加 XStream 插件 6 years ago
wei.peng bda52f76c6 软适配 Json 请求适配完成 6 years ago
刘敏 059688410c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 17be4078be 设备信息开发 6 years ago
peter.pan 24bbd75c81 Merge branch 'dev' into test 6 years ago
曾贞一 c7571b4c66 IS_GENERAL_TASK 添加单据是否生成任务状态 撤销 6 years ago
许心洁 b2328bb085 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
peter.pan 1fe05ab150 Merge branch 'dev' into test 6 years ago
曾贞一 c3fe273954 解决冲突 6 years ago
许心洁 60e6d51d35 流程管家2.0 6 years ago
peter.pan 4393c02bb3 Merge branch 'dev' into test 6 years ago
许心洁 4bad223c0d 直送发运JOB 6 years ago
汪云昊 341994c326 安灯报表优化 6 years ago
曾贞一 7a4d68c409 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 a7144e3a1f 同步标识 2 6 years ago
刘敏 e09ad49fc9 物料新增结算供应商字段 6 years ago
peter.pan 1c69b311a6 Merge branch 'dev' into test 6 years ago
刘敏 bfcd3ebaf0 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
peter.pan 8f977719c0 Merge branch 'dev' into test 6 years ago
许心洁 5a7ce32761 冲突 6 years ago
刘敏 0a78cf4ec5 数字类型新增get 6 years ago
许心洁 5e08aeb273 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng b5c204f873 软适配接口制作完成 6 years ago
许心洁 ce7095932c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
peter.pan 1de613a09c 同步频率 6 years ago
peter.pan 739f12657e Merge branch 'dev' into test 6 years ago
刘敏 07008f8e1b 实体修改 6 years ago
peter.pan 5c48b2eb79 Merge branch 'dev' into test 6 years ago
曾贞一 df49ab097b 赋默认值“待同步”为1 6 years ago
汪云昊 035a8b5924 定时任务日志信息优化 6 years ago
wei.peng 90439f55fd 添加 XStream 插件 6 years ago
wei.peng c4db15db9b 添加 XStream 插件 6 years ago
刘敏 f8fd8dbab0 同步标识修改 6 years ago
peter.pan 8daa2789a4 Merge branch 'dev' into test 6 years ago
曾贞一 1d1a2ac8b1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 cf33f70e31 代码规范 6 years ago
刘敏 2aa1e9811e 数字类型方法重写 6 years ago
汪云昊 7181e85ba5 安灯导出实体注解 
定时任务日志添加字段
 6 years ago
汪云昊 2e6f11daa8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
peter.pan bc9ac8d207 Merge branch 'dev' into test 6 years ago
刘敏 98d660f907 实体新增 6 years ago
刘敏 7811157312 实体字段新增 6 years ago
曾贞一 792dc0a190 WMS_MOVE_TO_ERP 增加字段年份 6 years ago
peter.pan 5a195bfe2e Merge branch 'dev' into test 6 years ago
曾贞一 2045b33801 单据锁定 SapOrderLock 添加字段同步标识 6 years ago
许心洁 6e30549ad4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 00fc0de4a9 冲突 6 years ago
许心洁 742e0a6f49 冲突 6 years ago
jenkins 7bcff3cc66 Merge branch 'dev' into test 6 years ago
jenkins cd70d9f66a Merge branch 'dev' into test 6 years ago
刘敏 89edbcb80a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 98041fe58d 流程管家优化 6 years ago
刘敏 b4a538ebb5 单位换算 6 years ago
曾贞一 0341dd2f5e bug #5030 6 years ago
汪云昊 ccf0764ee6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jenkins bc7267b777 Merge branch 'dev' into test 6 years ago
于学杰 63d7c2c6b8 1. 增加脚本引擎的POJO注释 6 years ago
刘敏 eafdcac5a4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 23c4b0742d 库存条码管理查询条件封装 6 years ago
jenkins 595a81f4b9 Merge branch 'dev' into test 6 years ago
jenkins 812be94ed3 Merge branch 'dev' into test 6 years ago
曾贞一 d5d6e21a15 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 8c5f7906af bug #5038 
bug #5045
 6 years ago
刘敏 03a261a048 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
刘敏 1819089a5a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jenkins 8c9a790faa Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jenkins 0fc49d5b2a IQ、OQ增加工厂字段 6 years ago
刘敏 9a61249756 库存条码管理查询条件封装 6 years ago
wei.peng 7f35883b08 登录会话添加设备ID 
自定义表单添加数据表唯一教研
自定义表单添加映射类型
 6 years ago
wei.peng 90fb9d3190 登录会话添加设备ID 
自定义表单添加数据表唯一教研
自定义表单添加映射类型
 6 years ago
wei.peng fb743ebafc 登录会话添加设备ID 
自定义表单添加数据表唯一教研
自定义表单添加映射类型
 6 years ago
曾贞一 062f4becf4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 471aec30fe 开发 WIP报废出库 6 years ago
jenkins 11cdc2bfa3 Merge branch 'dev' into test 6 years ago
刘敏 ddedecc11c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 5d7a44cec3 库存条码管理查询条件封装 6 years ago
曾贞一 1716628563 开发 发泡打箱包装job 6 years ago
jenkins 409cbb8492 Merge branch 'dev' into test 6 years ago
许心洁 db3d47cd6e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 4a717ec544 直送发运JOB+交易处理程序（下线结算）逻辑变动 6 years ago
jenkins f4141fd2c6 Merge branch 'dev' into test 6 years ago
曾贞一 c3ddcbb81a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 86d3f8de48 开发 发泡打箱包装job 6 years ago
jenkins 76b244bc08 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jenkins 40e20f7054 设备编号 6 years ago
曾贞一 60feef4bb5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 2240819def 发泡打箱包装 6 years ago
刘敏 6e2cf70951 库位校验枚举添加 6 years ago
jenkins c969b09b85 Merge branch 'dev' into test 6 years ago
曾贞一 f75630b64d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 3f5c28e1af 盘点单 优化提交组件回显信息 
复盘开发
部分业务增加模糊查询
 6 years ago
jenkins 49a936c660 Merge branch 'dev' into test 6 years ago
汪云昊 06bd10152c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 0942ff4636 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 7f1ef0bca7 自定义报表表单打通， 用户在线设置功能优化 6 years ago
jenkins e3819b31f5 Merge branch 'dev' into test 6 years ago
刘敏 7d5ea5bfec 客户物料号默认值 6 years ago
汪云昊 d63974140d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 af2e1a811c andon组织模型导入功能 
andon删除关联数据校验
 6 years ago
jenkins 577e1372ab Merge branch 'dev' into test 6 years ago
陈思洁 a064c6b84a 枚举新增条码类型 
库存条码表新增字段
 6 years ago
wei.peng 90048c3f0a Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 934da4419f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 4f553c0857 添加序列化ID , 用户登录在线机制完成 6 years ago
peter.pan ad09180809 Merge branch 'dev' into test 6 years ago
汪云昊 8e9ddf0ead Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 c1ca7cbcae Andon组织模型操作接口 
Andon班次计算调整
 6 years ago
peter.pan 4149183450 Merge branch 'dev' into test 6 years ago
陈思洁 48ab7a49d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 ecd72ed41e ASN订单明细数据新增分组查询接口 6 years ago
汪云昊 c11cc65e8f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 0a680275f3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 d7b79c659c WMS获取系统配置信息 6 years ago
peter.pan e2fde20be5 Merge branch 'dev' into test 6 years ago
刘敏 73b5758dc4 移动单主表返回数据 6 years ago
peter.pan 9ab2165086 Merge branch 'dev' into test 6 years ago
汪云昊 67c70189b3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 b601329fe8 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng 9b6ef53c08 添加组织功能优化 6 years ago
peter.pan 460dff866f Merge branch 'dev' into test 6 years ago
曾贞一 77d6345c15 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 6a2b19d3e3 bug #4953 6 years ago
peter.pan 79d4055ab7 Merge branch 'dev' into test 6 years ago
wei.peng 8461e12248 用户获取菜单信息调整 6 years ago
许心洁 9a60664fb3 需求变更：ASN订单类型为AMP时任务明细的业务类型描述要给AMP 
+BUG:交易处理组件：下线扣减：物料可能没有维护默认入库库位
 6 years ago
peter.pan 541198a1e9 Merge branch 'dev' into test 6 years ago
曾贞一 d258b846ac Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 483b93cb9f bug #4939 
#4914
 6 years ago
陈思洁 25d8df360d 实体字段修改hql 6 years ago
peter.pan 0526fcf05c Merge branch 'dev' into test 6 years ago
陈思洁 df8d025668 接口映射表基础数据维护 6 years ago
陈思洁 a3ccb4d449 hql提交 6 years ago
汪云昊 19afeb92b7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng c87f964668 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
peter.pan 7c8e02c0c9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
peter.pan 51efe95e86 pojo 6 years ago
陈思洁 1514f9434e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 623d17a2ec 字段默认值赋值 6 years ago
刘敏 73c474ee9d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 b941354087 盘点导入默认值 6 years ago
wei.peng fea0d476a4 基础操作,数据补全 6 years ago
wei.peng 2a587524ff 基础操作,数据补全 6 years ago
陈思洁 0e15934d16 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 6a3662283b 枚举修改赋值 6 years ago
汪云昊 0ed90485a6 安灯基础数据导入导出 6 years ago
于学杰 4350a82043 1. 完善脚本引擎 6 years ago
刘敏 72ac1f39f4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 d75570c987 库存报表问题修改 6 years ago
于学杰 5dc8cd5bda Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 02044789dc 1. TO ERP 增加单据行号字段 
2. 脚本引擎 & 规则引擎 增加工厂代码
 6 years ago
陈思洁 f26cdda8ec 实体新增字段 6 years ago
Chnx eb4914ae7a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Chnx 9c189dce3c 库存移动单查询接口 6 years ago
wei.peng 2aa2dca77f 用户权限调整 6 years ago
wei.peng 70fc1618a3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng be78ed2636 用户权限调整　帐号管理权限完成 6 years ago
wei.peng c858475bd2 用户权限调整 部门权限调整完成 6 years ago
wei.peng 3a19888ddf 用户权限调整 岗位功能调整完成 6 years ago
peter.pan 53d34096f7 Merge branch 'dev' into test 6 years ago
刘敏 a95b1c9623 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 cf7957525a 盘点指令默认值赋值 6 years ago
汪云昊 8e39e6d9fb Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 8a5a7c23ca andonPLC MQ 推送配置 6 years ago
汪云昊 0041ce328e 定时删除日志 6 years ago
wei.peng 78cd5dc77e 用户权限调整 6 years ago
刘敏 6861d44a1c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 a1a77b63db 下线结算标识、是否录入生产批次。 
POJO默认赋值2
 6 years ago
peter.pan d9ef2677fb Merge branch 'dev' into test 6 years ago
shiyanghuan b2866c85dd bug修改 6 years ago
wei.peng 1b1bc67c90 用户权限调整 6 years ago
wei.peng 0ca528bade 用户权限调整 6 years ago
peter.pan 61ecc2a74f Merge branch 'dev' into test 6 years ago
陈思洁 fba99de795 枚举修改 6 years ago
陈思洁 d47c9f8650 合并冲突pojo 6 years ago
陈思洁 f0e0867e2c 库存移动pojo新增字段 6 years ago
wei.peng a1f8ca3096 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
shiyanghuan b330676d61 库存报表业务改动以及bug修改 6 years ago
shiyanghuan af278555d0 库存报表业务改动以及bug修改 6 years ago
曾贞一 019087fe48 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
曾贞一 71087e5d43 组织树 数据权限修复 6 years ago
Chnx 0c841b645e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Chnx 8f182f962d 库存移动单查询接口 6 years ago
刘敏 d2839f6cf2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 58b067e3cc 库存报表存储区级联子存储区查询 6 years ago
peter.pan 5bed1d27ec Merge branch 'dev' into test 6 years ago
陈思洁 79b36a30a4 冲突合并 6 years ago
陈思洁 fe3d392e9b 新增枚举信息 
移库单明细表冗余主表临时字段
新增物料表字段
 6 years ago
wei.peng d7cb05e390 树DEMO 功能完成 6 years ago
wei.peng 6cd229e286 本地无法启动,更新代码 6 years ago
曾贞一 1f0bfd4554 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 cf96de8043 盘点 盘点差异结果同步ERP 6 years ago
刘敏 8f5d952c4f 单位查询工厂添加 6 years ago
peter.pan f3eb8d2356 Merge branch 'dev' into test 6 years ago
wei.peng 541b40d182 合并代码 6 years ago
peter.pan b39d7038fa Merge branch 'dev' into test 6 years ago
许心洁 e6d60f6886 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 dec3743911 流程管家推队列查询条件没有封装 6 years ago
wei.peng 2cbc082c7b 动态对象 空数据处理 6 years ago
peter.pan 36b2d36fdd Merge branch 'dev' into test 6 years ago
曾贞一 51753bb237 bug#4515 6 years ago
peter.pan 32a563e053 Merge branch 'dev' into test 6 years ago
陈思洁 dcb9b59ec9 新增一个实体封装 6 years ago
peter.pan 37b8755485 Merge branch 'dev' into test 6 years ago
wei.peng 37022efee8 合并代码 6 years ago
wei.peng 78cfff1748 功能优化 6 years ago
汪云昊 d3deaa6081 安灯bug解决 
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
 6 years ago
shiyanghuan 073393a5b1 bug修改 6 years ago
shiyanghuan 7dd78d1983 bug修改 6 years ago
shiyanghuan 172fc81bee bug修改 6 years ago
wei.peng 9dc634d63e 用户查询功能优化 6 years ago
许心洁 e43c493463 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 994da92b4e 交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG 6 years ago
peter.pan b18d393fe0 Merge branch 'dev' into test 6 years ago
曾贞一 b684bd2355 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 81ed2465e3 盘点实盘信息 增加字段 是否范围内 6 years ago
peter.pan e95db40c23 123 6 years ago
peter.pan 52addcf5ea Merge branch 'dev' into test 6 years ago
shiyanghuan 7ee861d61e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
shiyanghuan 2c28d6303f bug修改 6 years ago
peter.pan 543171dfbb Merge branch 'dev' into test 6 years ago
许心洁 f853f06ceb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 97b60f0906 下线结算HQL的BUG 6 years ago
jiajack b34ddf5f64 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 681ca7eebe 修改取值为空时的问题 6 years ago
wei.peng 1ac5542541 动态表单分页功能完成 6 years ago
peter.pan bd28a7ac63 Merge branch 'dev' into test 6 years ago
peter.pan 1ee48f4ef8 xxx 6 years ago
陈思洁 fede09a5eb WMS_ERP库存移动表修改item的数据类型 6 years ago
刘敏 7be287137a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 19b5764776 收货回执打印信息新增 供应商字段新增 出库条码规则校验修改 6 years ago
jiajack 7b70f47c64 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 27ba751a09 修改iqc数据库默认值 6 years ago
peter.pan e3354f52bd Merge branch 'dev' into test 6 years ago
shiyanghuan 52b9e09835 条码打印-条码模糊查询 6 years ago
陈思洁 92daec97e3 枚举修改名字 6 years ago
许心洁 47d8360a3b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 9b9f94f059 盘点调差暂时处理 6 years ago
peter.pan b8730fac47 Merge branch 'dev' into test 6 years ago
wei.peng ac5bf14d6b 动态表单动态操作　功能优化 6 years ago
许心洁 ebf517cb3d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 81eb13bafd 写入SAP单据锁定表 6 years ago
许心洁 15386ae5c2 枚举 6 years ago
peter.pan 628f1db31c Merge branch 'dev' into test 6 years ago
曾贞一 842f322188 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 529617a8b7 优化 6 years ago
汪云昊 ff9a5dcd17 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 4fe3701929 还原 6 years ago
汪云昊 98de08ba4a 文件上传优化 
字段删除异常
日志添加索引
 6 years ago
peter.pan 96264870c2 Merge branch 'dev' into test 6 years ago
许心洁 efbe9dac9e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 bf02cbf8a4 PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算 6 years ago
shiyanghuan cef6d9c3ad bug修改 6 years ago
shiyanghuan da5d5d1af0 客户编号-模糊查询 6 years ago
peter.pan 9c38ed702a Merge branch 'dev' into test 6 years ago
shiyanghuan e00a0a9d9d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
shiyanghuan c2609be241 作业类型分页查询 模糊查询 6 years ago
刘敏 97adebba21 枚举新增 实体字段新增 6 years ago
刘敏 eefaf55f24 供应商字段类型修改 6 years ago
刘敏 7fc7fab54c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 493fbb83d9 条码查询条件 6 years ago
peter.pan 3b1d19bbab Merge branch 'dev' into test 6 years ago
曾贞一 a7fbc9e58f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 b5ff789263 开发 wms推送AMP库存数据 6 years ago
陈思洁 a8dee4713a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 31f6f4deef 枚举字段新增AMP 
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
 6 years ago
刘敏 16301be9dc JOB开发实体新增 6 years ago
刘敏 1b569ff3a8 ERP同步标识枚举添加 6 years ago
刘敏 3090b2aaad 实体缺失字段新增 6 years ago
刘敏 8cbc19eb37 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 da12d8f6b0 错误信息字段冗余 6 years ago
许心洁 c7aca0a94d 交易处理主程序转换数据错误+出入移库查找添加条件 6 years ago
wei.peng ee5a4f1dfe Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
曾贞一 703dc6851c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 f85a0296ae 开发 bom拆解功能 6 years ago
于学杰 dd2408cd4a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 72ef115db8 1. 批次字段不允许为空 6 years ago
wei.peng d1cbfa27e8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 0962b810ce Json 转换精度丢失 6 years ago
刘敏 0a69cddb53 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 b98b48e4e5 SAP_产品报工汇总表新增 6 years ago
陈思洁 ede4458709 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 6f41158ecb 生产发运新增实体属性 6 years ago
wei.peng 5d2695a5cb Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
刘敏 08af5fde04 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
peter.pan a551249165 Merge branch 'dev' into test 6 years ago
wei.peng 30bed57c04 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 7e9a7698a0 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 2eba4bb745 文件上传接口 
excel通用导出优化
 6 years ago
于学杰 bc6d7f5c4d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 e7bd528736 1. 设置 is_sync 字段不允许为空，默认值为 2 6 years ago
wei.peng 2e5b7466c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 d9d776060f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago