888 Commits (f3151cbbe38d260071781fdd9565096974106450)

Author SHA1 Message Date
刘敏 06a42e315b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 a6d0def85d 查询条件优化 6 years ago
jimmy aca664fc4f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jimmy 1aee9a6cf5 修改基础数据的findByHqlWhere方法 6 years ago
Silliter 6aec563884 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 927799e1db 更新库容方法优化 6 years ago
amy a91ff1feaf 查询优化 6 years ago
amy 062d56573f 查询修改 6 years ago
amy 06dd8b42da 查询优化 6 years ago
gragon.xu 1a8a6418d8 物料分页查询条件加上“snControl” 6 years ago
gragon.xu 3926ba11c1 监控台 6 years ago
gragon.xu ec9764d3d7 d 6 years ago
Silliter afac75bb2b 质检明细删除问题修改
看板卡新的moveno生成问题
任务操作问题
校验库容问题
6 years ago
Silliter 8d1567a0b5 根据任务关联单号模糊匹配任务列表 6 years ago
Silliter 5abb5d1821 任务列表优化 6 years ago
Silliter 588a517ae1 任务列表接口优化 6 years ago
gragon.xu 0744d38714 质检基础数据前后端调整:去掉入库单号,把关联单号作为查询条件;数据不可操作 6 years ago
柯裕 ee33834f9a 优化 6 years ago
Silliter 8a69224e05 优化入库和质检明细处理业务 6 years ago
gragon.xu 6b25e77793 监控台模拟数据+不同库存数量接口修改 6 years ago
Silliter 7f36c485ab 盘点实盘 6 years ago
gragon.xu ae8f051f53 单号生成 6 years ago
gragon.xu 72691f50ed 散件收货移动单明细推入队列错误;
库位物料字段维护;
6 years ago
Silliter b17d65356a 盘点主表新增get方法 6 years ago
gragon.xu d9a523473d PO散件单据不可以生成条码+任务生成随机单号加上“RANDOM”标志 6 years ago
Rock.Yu ec7fbd6b72 1. 增加了无状态的会话 6 years ago
Rock.Yu bc9eb6c673 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu 9fabcbc85d 1. 业务规则中用到的对象必须加到 POJO 里 6 years ago
Silliter 7343d25e19 流程管家优化
任务列表优化
6 years ago
Rock.Yu a85cc69e14 1. 修复 Object 加载有问题的 BUG 6 years ago
Silliter a13d87c246 优化任务列表和流程管家 6 years ago
gragon.xu d9b1be4622 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 5d52910960 移库单主表的“是否校验条码”字段去掉 6 years ago
amy 67e0d7a443 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
amy fc6368ca5f 查询条件封装修改 6 years ago
gragon.xu 13106615ee PO明细标准包装改为Double 6 years ago
gragon.xu b8e9d9c1d4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 43ad2e35c9 代码错误--刘敏 6 years ago
Rock.Yu 2aa692a9c0 1. 增加无参数的构造函数 6 years ago
柯裕 0c73ad7072 移库明细新增临时字段 6 years ago
gragon.xu 6e4d59cf7f 根据PO单号批量生成条码 6 years ago
gragon.xu 47424307f2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 4b5fc9d394 根据PO单号批量生成条码 6 years ago
amy 03b28b5682 数字型字段get方法重写 6 years ago
Rock.Yu e58b28ecc4 1. 完善规则引擎,增加了规则存储在数据库的功能
2. 修改脚本引擎 repository 命名
6 years ago
gragon.xu 6dccfc8fa8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 404ad6bad8 交易处理组件生成移库单新增属性“是否指定条码”默认为是 6 years ago
jimmy 9dca4f2dbb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy eda257bf23 盘点PDA端,输入数量校验 6 years ago
Silliter 85210d4ca1 优化流程管家 6 years ago
amy b0e4f719e2 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
amy 53628e89d7 代码规范修改 6 years ago
jessica.chen 3390a89b29 修改基础数据备注字段 6 years ago
amy fc80e34b14 代码规范修改 6 years ago
Silliter b36ba9c34f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 4f31301ea1 流程管家收货业务优化 6 years ago
gragon.xu a3f258dd1d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 7020b1a534 前端:库存交易记录添加移动单号作为查询条件;
后端:添加常量TASK_JOB,TRANS_AM + 库存交易记录添加移动单号作为查询条件 + 修改任务生成component属性命名 + 修改获取冻结数量HQL + 交易反向处理:交易过期提示,数量比较要用.doubleValue
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
jessica.chen 8a396061b5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 73d1378f0d 修改移库单条码的sql查询语句 6 years ago
jiajack 3a5f43f97b 删除iml文件 6 years ago
Silliter 5a59437437 优化代码 6 years ago
amy 71279f2241 查询条件新增 6 years ago
yihang.lv 6e8e425f1e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 4a97182c45 供应商登录微服务 6 years ago
amy 17d9927b1a 代码优化 6 years ago
jimmy 86125cff37 盘点pc端 6 years ago
jimmy 15542b7205 盘点pc端:散件盘点 6 years ago
Silliter ca118faefd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter e53418c2dc 提交代码 6 years ago
柯裕 8692e0dc23 增加库存条码开窗查询 6 years ago
gragon.xu 678d154b1f 需求变更:所有单据明细和条码查询条件去掉行号;生成入库单的明细的是否免费字段默认为计费 6 years ago
jimmy 11fd6979ed 盘点pc端 6 years ago
amy 07c227769d 修改 6 years ago
Rock.Yu 28458ac2fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu a222cf09d9 1. PDA通用组件测试代码修改 6 years ago
jimmy 18964b2977 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy f04cb00994 盘点pc端 6 years ago
gragon.xu 0863e49b1a 任务合并查询明细错误:基础查询方法改版
单据任务生成状态默认:10创建
交易处理组件:移动单不一定有关联单据,代码错误
6 years ago
Rock.Yu 8a10110f4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu a49647f275 1. 增加注解 6 years ago
amy 74651aa817 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 34cadcfb54 更新库容公用方法优化 6 years ago
jimmy 64fd37652d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 1d57eb5a10 盘点pc端 6 years ago
Silliter 6c1316f262 合并代码 6 years ago
Silliter 1adb344e31 优化流程管家 6 years ago
gragon.xu 59b086dc5d BaseBean.findByHqlWhere:查询别名代码错误
WmsHqlPack:修改封装方法使用DdlHqlPack
任务合并代码错误
6 years ago
amy 02483b4f92 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy 0825229a78 移库单明细实体修改 6 years ago
jimmy 2e9ed6a288 散件盘点 6 years ago
柯裕 2988f34bbd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 6b89f8d572 更新实体 6 years ago
amy fcc36ef7f6 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
amy c1b477dd32 修改 6 years ago
柯裕 c43a166a25 优化module 6 years ago
柯裕 956c8c0362 增加临时变量 6 years ago
柯裕 1f11a6f280 更新实体 6 years ago
柯裕 6944deef54 实体类更新 6 years ago
jimmy a6dd9e53ec Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 3902dcca43 盘点PDA端 6 years ago
amy 006fe4b95a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy ecdd1d45de 是否散件枚举添加 6 years ago
柯裕 98d4f691f1 优化 6 years ago
amy 6fb971cd60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy 9b8ebb5628 实体数量处理 6 years ago
gragon.xu 0e9315cd89 作业任务生成事务控制 6 years ago
Rock.Yu c38a62955d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu bd4df83519 1. 增加脚本引用 POJO 6 years ago
jimmy cd00bdd954 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 3c2a345b93 盘点pc端 6 years ago
柯裕 9477ba5c91 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 26b4f3e5b4 调整微服务入参 6 years ago
Silliter 5a557495af Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 84c07f3db0 优化单据打印业务 6 years ago
gragon.xu dd31efa945 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 9a185abed1 调用获取单号不需要SID+盘点实体添加是否散件字段 6 years ago
柯裕 1f50fecf80 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 0211390c44 PO明细实体状态数据类型更新为Integer;
PO明细查询封装hql单据编号匹配改为equal
6 years ago
gragon.xu 8b3b37260e 枚举统一 6 years ago
gragon.xu 2987e34dc7 ASN,PO明细表,产品入库表的ERPWHNO改成ERPAREANO 6 years ago
jimmy e09d96a925 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy b2544dcb43 盘点调差开发 6 years ago
amy 69cef0bf3a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy ecde67e47e 修改 6 years ago
Silliter 287a9b3892 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 9a7c26338a 订单打印,流程管家优化 6 years ago
柯裕 e2a6619dcc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 130343ea6b PO明细实体更新 6 years ago
yihang.lv b41e06f412 wmsPOMasterDetails erpWhNo---》 erpAeraNo 6 years ago
Silliter fea99120ca Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 4be69f77c0 开发单据打印 6 years ago
柯裕 913dcae75f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 85493e4f88 散件收货查询 6 years ago
gragon.xu 2ce0dcbaf1 dragon 6 years ago
amy 1560a9b73d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy fb819c27b2 实体字段添加 6 years ago
yihang.lv 39ddab4cf9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv e4bbd3a1a1 物料表 添加 是否条码管理 6 years ago
amy ce9ad43cd8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy e4a271cd4f 庫位物料新增是否生成領料單字段 6 years ago
gragon.xu 2a38dc0b0c 库位的零件数量为Double类型 6 years ago
jimmy 2192ecdb18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 871fae62ec 重写库位get方法 6 years ago
Silliter ec50aef781 开发单据打印 6 years ago
jimmy 94f588cfdb 盘点PAD组件 6 years ago
柯裕 b65f6197c5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 2e578200d8 质检主表添加是否散件字段 6 years ago
Silliter 3e9a40a47a 开发提交按钮控制 6 years ago
Silliter b99c28e1b1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter a889e00cba 优化任务列表 6 years ago
amy cd3ef63c90 po是否散件字段添加 6 years ago
amy 4dd8bd3b5c 移库单字段新增 6 years ago
gragon.xu 8ef0e787b9 交易反向处理 6 years ago
Silliter d14e0a5cb2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 046ece7221 流程管家优化 6 years ago
yihang.lv 2cf97f8ed1 移库单订单条码表 分页查询 条件去掉 partNameRdd 6 years ago
yihang.lv f9a820dae4 bean 所有QTY数量默认为0修改 6 years ago
yihang.lv 1176053fe9 移库单条码表增删改查 6 years ago
jessica.chen e4aa1cfbc3 库存移动明细数据实体 6 years ago
Silliter 1f4a00f39e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 01dc635d38 开发流程管家 6 years ago
alwaysfrin e10d71919a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 6f8f13c552 根据类型查询库位分页 6 years ago
alwaysfrin 1897d227e6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin ea2eb6103d 优化调整 6 years ago
Silliter 4aaa9bc03a 1.优化流程管家
2.开发条码打印,订单打印,收货回执打印
6 years ago
gragon.xu 3be87f2882 作业任务表:“是否配料”->“是否一步法操作” 6 years ago
gragon.xu 6b9823cd64 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 18fc77b99c 反向交易处理程序+作业任务新增“是否一步法”字段 6 years ago
Silliter 5f76a14276 优化条码打印功能 6 years ago
gragon.xu ca8b9462b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 970fa83557 dragon 6 years ago
Jack.lv b9d00d181e 条码枚举 6 years ago
Silliter 75e622763c 解决冲突 6 years ago
Silliter 234aad93e3 1.优化流程管家
2.任务列表查询加入任务状态字段
6 years ago
gragon.xu c9215a7079 任务明细没有工厂;任务合并hql语法错误 6 years ago
jimmy 4e8ab00fed Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 6cf53459e2 修改代码 6 years ago
amy 8df7fb3f4b Merge remote-tracking branch 'origin/dev' into dev 6 years ago
gragon.xu 78d551f8e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 4ef08afaa7 dragon 6 years ago
amy bf24e3f58c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy ebc92f6290 实体新增临时字段 6 years ago
jimmy 8d442fcafa 修改代码 6 years ago
Jack.lv 5c6ab755dd userTime改为userTime 6 years ago
Jack.lv eb37a1f7ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv fa4c4cd957 作业类型删除处理组件编号和数据来源编号 6 years ago
Silliter dcfb0f5cdf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 738db8d837 条码打印开发,角色微服务提供 6 years ago
jimmy f52b3ff189 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 8da671628c 盘点PC 6 years ago
柯裕 bbfd340fd0 质检 6 years ago
Silliter e20936ca2b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter c4ef1e66f3 开发条码打印后端 6 years ago
amy 6630842f3c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy b883f7de2d 添加临时变量 6 years ago
Jack.lv 630c6e8f66 作业处理组件增删改查、作业任务明细查询、作业任务生成日志查询完成 6 years ago
Silliter 11bbe2a57d 优化流程管家 6 years ago
gragon.xu 48161d95a1 枚举冲突 6 years ago
gragon.xu e7fa2f3abf NC,盘点交易处理组件 6 years ago
Jack.lv 972d2b04a7 wmshpak删除多余代码 6 years ago
jessica.chen 30996a92a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 166b725e43 出库组件新增 6 years ago
Silliter 74b63d8a72 开发流程管家根据任务创建流程 6 years ago
gragon.xu 87a033a427 外部单据的计划时间全部从zDate,zTime改成planDate,planTime,否则HQL执行失败 6 years ago
gragon.xu 868be93389 质检单和移库单主表的CUSTOMER_NO修改成了CUST_NO 6 years ago
gragon.xu 8a58b48826 移库单主表去掉物料号,物料名称,数量属性 6 years ago
Jack.lv a8736a4747 新增、修改、查询 数据权限 6 years ago
Jack.lv c0be6489a3 bean修改 Warehouse 回退为原来的code 、 name 、address 6 years ago
Jack.lv 56568be77e bean修改 WmsHqlPack 同步pdm 6 years ago
Jack.lv f6c64a8632 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv d6def493e4 bean修改 同步pdm 6 years ago
gragon.xu e1825eac40 交易处理组件ALL 6 years ago
Silliter 238160a65f 数据访问层优化 6 years ago
gragon.xu a7dea093d7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 86e96e8f76 交易处理组件公共方法提取 6 years ago
Silliter 9c08de7a7a 定时获取库存移动信息开发 6 years ago
Silliter 9401fb9b00 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 8ac4046a7d 开发校验权限和获取个人任务列表公用方法 6 years ago
jimmy d289e7009a 增加移库移动明细表 已移库数量 6 years ago
gragon.xu 274c5aec26 dragon 6 years ago
gragon.xu 201f960d08 冲突 6 years ago
gragon.xu 31d91f48b3 收货交易处理组件开发 6 years ago
柯裕 398a3d98c5 更新POJO 6 years ago
gragon.xu f662140075 WmsOrderMasterModel无用了 6 years ago
gragon.xu 7e8965421e WmsOrderDetailsModel 6 years ago
amy 946d4bf634 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy 1fd8e5e76f 实体字段添加 6 years ago
gragon.xu ded9b1c37f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu d89770e138 作业任务处理程序 6 years ago
Jack.lv ed7857b86d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv b667d6840e 获取权限和根据权限获取任务列表 6 years ago
jessica.chen 0ce23f95b1 拆分组件修改 6 years ago
柯裕 e3ae013868 更新POJO 6 years ago
柯裕 f25395ebd6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 ce9cbe1198 更新pojo 6 years ago
gragon.xu e3a87e5d2e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu fc89b8493d 移库单明细新增源,目库存地属性 6 years ago
Silliter bdf8a8993f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter a5390d7b1a 开发拆分条码逻辑 6 years ago
Jack.lv 296db97c72 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Jack.lv 6c6710dd67 在途库位 枚举修改 6 years ago
gragon.xu 3056922b15 POMasterDetails修改属性名whNo->erpWhNo 6 years ago
gragon.xu 4d3b4ac15c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 44148da43c comit 6 years ago
Rock.Yu 4d5b9da91d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu 9a9c7ba7ec 1. 增加获取条码下一步状态的实体类 6 years ago