976 Commits (994da92b4e197feae41724b5eded4b154845e2ce)

Author SHA1 Message Date
Chnx a9f33764b2 po订单主表箱数默认0 6 years ago
刘敏 6546ae1562 要货计划实体新增 6 years ago
刘敏 77e2d1e3ec 物料表字段新增 6 years ago
Chnx f12e480ff7 po订单表添加箱数字段 6 years ago
于学杰 c90d70e54f 1. 完善 SAP - WMS 接口程序 6 years ago
许心洁 29605d0c37 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 5ef906d88f 交易处理组件去掉生成收货入库单逻辑+新增公共初始化组件+任务生成去掉调试邮件+作业步骤参数类型查询条件去掉工厂+交易类型对象去掉作业类型编号属性 6 years ago
于学杰 9b6e8bf921 1. 修改拼错的单词 6 years ago
于学杰 65ddc6f57a 1. 完善SAP WMS 接口 6 years ago
曾贞一 ba23663011 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 db7b849f3e 添加 移库单主表字段 6 years ago
于学杰 65efb44dde 1. 把默认值的类型改为 Object 6 years ago
shiyanghuan 3c5dea23fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
shiyanghuan 37eb33bcad 线边库实体以及WmsHqlpack中添加sql封装 6 years ago
陈思洁 6fb0abcadd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 cbb658e088 冗余字段新增 6 years ago
许心洁 052652dd36 交易处理组件(收货):物料查询没有加工厂+流程设计:步骤调用参数值可以为空+作业处理组件:未修改不需要唯一校验 6 years ago
许心洁 4261207e54 交易处理组件(收货):物料查询没有加工厂+流程设计:步骤调用参数值可以为空+作业处理组件:未修改不需要唯一校验 6 years ago
于学杰 b4e0effcb0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 46a361a291 1. 增加 SAP - WMS 接口转换实体类 6 years ago
刘敏 4cfe208bb7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java
6 years ago
刘敏 91442ec8ff Wms V3新增实体创建 6 years ago
陈思洁 767758f7a2 PO字段新增 6 years ago
陈思洁 854cb4e106 项目表新增,物料表中项目字段添加 6 years ago
于学杰 4a7081f90b 1. 添加 SAP 中间数据库转换接口的 POJO 类 6 years ago
曾贞一 4fef723bdb 增加移库单主表字段 6 years ago
曾贞一 25187ecf2c 存储区树型查询接口开发 6 years ago
曾贞一 65beb8549f wms存储区添加字段 是否子节点IS_SON_NODE 6 years ago
刘敏 93fa0d1aaa 实体字段与pdm比对添加 6 years ago
陈思洁 e33c7c2465 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 9d9f5a2cc2 抽点记录查询条件增加 6 years ago
刘敏 0b186e1317 物流路线查询修改 6 years ago
刘敏 ca0a671e92 #4337 6 years ago
陈思洁 37dc68b858 修改hql语句 6 years ago
陈思洁 f6acf45ace 实体中增加乐观锁字段 6 years ago
许心洁 76e553234e MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解 6 years ago
汪云昊 93ace83b5f 长文本数据类型 6 years ago
许心洁 cca408fcf0 监控台:防止出现负库存+流程配置:流程添加POSITION字段 6 years ago
许心洁 c7e417e644 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 a65b3d6fb2 交易处理组件基础方法维护+流程配置+任务生成代码结构层优化+交易处理主程序查询移动单条件修改调工厂代码(代码逻辑错误) 6 years ago
曾贞一 81821c70a8 移库单 生成条码问题 6 years ago
许心洁 37efbf718e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 4cf5fbc2b7 #4091+流程配置复制流程+作业步骤参数,作业组件,作业组件参数,作业流程基础数据接口代码调整 6 years ago
Silliter 10844622a7 1.优化查询语句
2.流程管家查询条件加上工厂字段
6 years ago
许心洁 58c29f5aee 作业流程接口+作业组件接口联调优化 6 years ago
许心洁 24d115be6d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 35690ce138 作业流程界面+后端分页查询接口 6 years ago
jimmy bc1b0b7e90 业务类型表 字段数据类型修改 6 years ago
jimmy fc15efe67c 开发业务类型增删改查接口 6 years ago
Silliter 733b65e8d5 流程管家优化:1.缓存重新规划
2.重入保存上一步的回显
6 years ago
许心洁 85a44b1baa Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 19f30ce4f9 流程配置+定时处理错误移动单给错误信息赋值过长 6 years ago
jimmy f39abebd90 qc HQL修改 6 years ago
jimmy b1d8addd0f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jimmy c72c2fa891 散件盘点 6 years ago
刘敏 7ffa55fbe8 查询条件方法优化 6 years ago
许心洁 53dc8aaa15 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 2231000f9a BUG#4050+基础数据服务划分代码优化 6 years ago
刘敏 b61a2bbea7 实体数字类型get方法重写 6 years ago
yihang.lv e790b209e5 sweb开窗改为微服务 6 years ago
许心洁 51c5e36838 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 b17b15964f 交易处理主程序调用组件异常处理优化 6 years ago
jimmy 5e625f45b8 增加WmsMoveMastersql 6 years ago
柯裕 3d44d85633 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 da153214f9 优化 6 years ago
Silliter 931a4a04d3 开发全局配置接口 6 years ago
Silliter afae8d085e 任务明细开发 6 years ago
Silliter c03c7d3331 自定义规则开发 6 years ago
Silliter b3f4ccbb78 自定义脚本开发 6 years ago
jimmy bb811306ff 修改 wmsShopping 为 wmsShipping 6 years ago
yihang.lv 7da6627878 sweb通知公告 6 years ago
Silliter 0eb50142fe 优化查询 6 years ago
jessica.chen 580d25a8f8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 48eedb360e 调用库存条码信息查询sql优化 6 years ago
Silliter 660a95c879 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 19f62ab850 实体添加查询索引 6 years ago
柯裕 7a7a875bef Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 0294f12b5b 优化hql 6 years ago
jessica.chen 0cc66369c2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 6d2f783930 库存信息、库存条码信息、库存交易、库存交易条码sql优化 6 years ago
柯裕 3192d0cd2d hqlpack优化 6 years ago
刘敏 ef071e2bbf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 8346b4c6f6 查询条件优化 6 years ago
jessica.chen 15a399e86d 产品发运、抽点记录、质检三张表的查询sql优化 6 years ago
柯裕 cf4b412180 优化sql查询 6 years ago
刘敏 3918b6b8e3 move查询条件优化 6 years ago
刘敏 54211af6f4 asn查询条件优化 6 years ago
刘敏 54af172d43 供应商查询条件优化 6 years ago
刘敏 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