973 Commits (78cfff1748dd37740122c8fe6b2102cd806dbe59)

Author SHA1 Message Date
陈思洁 91999948b6 sql优化 6 years ago
刘敏 e726833580 非JIS发运实体新增 6 years ago
许心洁 ada53de0fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 f69795cc5f 任务数据来源基础数据维护唯一校验修改 6 years ago
sky.meng baee01a070 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
sky.meng 5f898661c7 添加产线(工作中心)-存储区信息 repository 6 years ago
曾贞一 8d64152e58 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/sqlpack/WmsHqlPack.java
6 years ago
曾贞一 8289de8259 优化 新建盘点范围数据
需求更新 盘点冻结业务
6 years ago
shiyanghuan 619487aedb 修改库位物料和供应商物料bug 6 years ago
shiyanghuan f7d4f85d45 库位物料和供应商物料bug修复 6 years ago
刘敏 721ddbee3c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 16400aa31c 实体字段修改 6 years ago
sky.meng e5e0da62e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
sky.meng 939d67e7f3 添加产线信息管理(工作中心) 6 years ago
许心洁 dfef27151d 冲突 6 years ago
许心洁 f834e91353 Task#764+枚举TRUE_OR_FALSE 6 years ago
陈思洁 f89a98479c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 30dd11cce7 sql拼接优化 6 years ago
peter.pan 62b2ea298b 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/WmsEnumUtil.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
6 years ago
peter.pan ea83820fbf 新增物料类型跟单位类型 6 years ago
许心洁 fe13a43ccc WmsEnumUtil冲突(几步法) 6 years ago
shiyanghuan 2be5f29a63 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
shiyanghuan 40f0860647 修改库位物料和供应商物料bug 6 years ago
shiyanghuan 4fad1795b1 修改库位物料和供应商物料bug 6 years ago
陈思洁 fb98db0bcc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 c08a569ac5 sql优化
数据权限实体增加字段
枚举增加数据权限的交易对象
6 years ago
刘敏 3bb095a8ab Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 7d0cd674cf 零星退料指令导入开发 6 years ago
peter.pan 67cd5e008b 主数据信息sql拼装 6 years ago
许心洁 79d1da3230 系统数据初始化 6 years ago
sky.meng 8409025253 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into stock_report
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
6 years ago
sky.meng a67f88a4bb 库存报表开发 6 years ago
曾贞一 beb2285591 移库单业务逻辑修复 bug#4495 6 years ago
曾贞一 ca625dbfcc 开发 交叉盘点业务,新建盘点范围表,盘点调差范围表 6 years ago
于学杰 c3ff60a581 1. 解决 WMS 数据权限查询时多个值覆盖的问题 6 years ago
shiyanghuan b871b34dba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
shiyanghuan 54d7190bf0 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/sqlpack/WmsHqlPack.java
6 years ago
陈思洁 be8c20fc45 收货回执单据打印修改--ASN订单冗余标准包装字段 6 years ago
shiyanghuan 1ad24c40f1 增加供应商物料信息 6 years ago
陈思洁 821afdd75b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 fbfba84ab0 冗余业务字段数据
修改任务明细查询方法
6 years ago
刘敏 b6b6ca8c1e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 1eda68e151 sap接口实体新增 6 years ago
许心洁 ec158d9bdf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 d3431028d7 StockQuan表新增ScrapQty字段:NC,盘点调差,出入移库交易处理组件+控制台逻辑变动 6 years ago
于学杰 45cd34f067 1. SAP - WMS 接口 POJO 类中增加 groupName 属性 6 years ago
于学杰 804fd91527 1. 完善 SAP - WMS 接口 6 years ago
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