1521 Commits (7863325afdf746d494d223acee78ba71524a0af0)

Author SHA1 Message Date
刘敏 a83b552203 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 2bc04b407e 计划日期、时间新增 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
曾贞一 acd1e6cfb6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 ce70994a57 盘点 按照盘点差异类型汇总 6 years ago
陈思洁 4d00397411 修改盘点范围的排序规则 6 years ago
陈思洁 b3a552d65d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 070bacf20e 所有外部单据增加创建时间和创建人的查询条件 6 years ago
刘敏 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
曾贞一 9d70008912 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 61ce4d1b3f 优化 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
曾贞一 abf155ecd9 库存报表 创建人、创建时间添加 6 years ago
刘敏 839c139222 库存移动条码报表优化 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
许心洁 a713e835fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 ff52a412d4 库存初始化信息 6 years ago
陈思洁 b604c5d9a0 交易记录增加字段 6 years ago
许心洁 92d4bf46ce #5255,#5039 6 years ago
jimmy.zeng bf293d4758 生产报工时,原材料move单号写入关联移动单号中 6 years ago
刘敏 dacc203119 库存报表修改 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
于学杰 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
许心洁 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
陈思洁 a4f2a7c848 hql修改asn订单明细 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
陈思洁 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
曾贞一 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
许心洁 bb8078cb94 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
许心洁 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
曾贞一 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
刘敏 0a78cf4ec5 数字类型新增get 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
刘敏 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
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
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
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
曾贞一 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 40e20f7054 设备编号 6 years ago
jenkins c969b09b85 Merge branch 'dev' into test 6 years ago
曾贞一 3f5c28e1af 盘点单 优化提交组件回显信息
复盘开发
部分业务增加模糊查询
6 years ago
jenkins e3819b31f5 Merge branch 'dev' into test 6 years ago
刘敏 7d5ea5bfec 客户物料号默认值 6 years ago
jenkins 577e1372ab Merge branch 'dev' into test 6 years ago
陈思洁 a064c6b84a 枚举新增条码类型
库存条码表新增字段
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
peter.pan e2fde20be5 Merge branch 'dev' into test 6 years ago
刘敏 73b5758dc4 移动单主表返回数据 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
许心洁 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
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
刘敏 b941354087 盘点导入默认值 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
peter.pan 53d34096f7 Merge branch 'dev' into test 6 years ago
刘敏 cf7957525a 盘点指令默认值赋值 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
peter.pan 61ecc2a74f Merge branch 'dev' into test 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
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
曾贞一 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 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
peter.pan 36b2d36fdd Merge branch 'dev' into test 6 years ago
曾贞一 51753bb237 bug#4515 6 years ago
peter.pan 37b8755485 Merge branch 'dev' into test 6 years ago
shiyanghuan 073393a5b1 bug修改 6 years ago
shiyanghuan 7dd78d1983 bug修改 6 years ago
shiyanghuan 172fc81bee bug修改 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
曾贞一 81ed2465e3 盘点实盘信息 增加字段 是否范围内 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 681ca7eebe 修改取值为空时的问题 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
许心洁 9b9f94f059 盘点调差暂时处理 6 years ago
peter.pan b8730fac47 Merge branch 'dev' into test 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
peter.pan 628f1db31c Merge branch 'dev' into test 6 years ago
曾贞一 529617a8b7 优化 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
刘敏 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
刘敏 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
刘敏 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
于学杰 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
陈思洁 d9d776060f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 557880ffd2 生产报工明细实体修改 6 years ago
shiyanghuan b29d5722bc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago