1550 Commits (7f8c0303fe1489e785024e7579f8040b756a17f6)

Author SHA1 Message Date
gragon.xu 6396fb1a38 物料查询新增“snControl”条件 6 years ago
yihang.lv d2aed4c166 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 9ec20ed314 标准包装导入,发布列表修改 重写 6 years ago
Silliter 8a69224e05 优化入库和质检明细处理业务 6 years ago
yunhao.wang 3d3260c1a7 表单菜单权限接口 6 years ago
crish e30173cef6 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 82a798083b MES 生产队列,生产工单模块 6 years ago
gragon.xu 6b25e77793 监控台模拟数据+不同库存数量接口修改 6 years ago
crish 21ef38428c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish e5e0c05b9f Mes生产计划开发 6 years ago
jiajack 9ccd0647c6 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
柯裕 3cbc5c4d99 添加model 6 years ago
wei.peng 97e992f05f 自定义表单拦截器开发1.1完成
优化动态表单页面接口
6 years ago
yunhao.wang 3a704f8542 添加冗余字段 6 years ago
gragon.xu cd1c135594 交易处理组件isPart!=isSnControl(新增枚举取反方法)+库位新增默认状态为“空库位” 6 years ago
jiajack 44241bb51b 添加实体Repository类 6 years ago
jiajack a64323fb0d 添加对象 6 years ago
jiajack 2737ea90fd 修改排序字段命名 6 years ago
yihang.lv a132a6b1bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 50f0a7d52a 新增逻辑修改 6 years ago
Silliter 7f36c485ab 盘点实盘 6 years ago
yihang.lv 1a583f7ebb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv ce55dda367 确认订单目录调整 6 years ago
gragon.xu ae8f051f53 单号生成 6 years ago
gragon.xu f092c1842c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 72691f50ed 散件收货移动单明细推入队列错误;
库位物料字段维护;
6 years ago
yunhao.wang 1e22ff7e75 表单-拦截器添加状态 6 years ago
crish b2efdd2496 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish f7b85978cc MES Repository构建 6 years ago
crish 71607407ac MES 班次信息实体构建 6 years ago
crish ab1e524f20 MES生产计划枚举 6 years ago
gragon.xu 01a5cb287b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu e20d212991 IS_GENERAL_TASK加上Code+DATA_STATUSCode值改为TRUE和FALSE 6 years ago
crish 5eea2ed315 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 6916ae20de 客户产线代码实体和Repository 6 years ago
crish 5f13bf7f1d 实体属性修改 6 years ago
alwaysfrin 9418373b4d DdlPack,封装bug 6 years ago
crish 8678d9961e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish e161894239 Mes生产计划枚举类 6 years ago
Silliter f0dcbb6c9e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter b17d65356a 盘点主表新增get方法 6 years ago
yihang.lv 6a275a9402 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 7535d82bed 发布列表修改、发布 修改存在 bug 6 years ago
wei.peng af8f8884a2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 3cf0c42569 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 7e14a06a8d 添加方法类型备注 6 years ago
wei.peng 120ea87da8 动态接口集成 Bug修复 6 years ago
gragon.xu d9a523473d PO散件单据不可以生成条码+任务生成随机单号加上“RANDOM”标志 6 years ago
yihang.lv c4c20ae00f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 6f3fefe3b4 发布列表修改、发布 6 years ago
crish 4c366b1d8a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 4d9b1efb69 MES 生产计划枚举 6 years ago
Rock.Yu ec7fbd6b72 1. 增加了无状态的会话 6 years ago
yihang.lv bbf0fb6b62 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv a464028a3b 新增初始化 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
alwaysfrin 323489e7db Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu c44721fe91 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu a85cc69e14 1. 修复 Object 加载有问题的 BUG 6 years ago
alwaysfrin 6960275e3b DdlPack,日期封装bug 6 years ago
yunhao.wang 9a895f2e6a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 8402877d9a 表单功能接口 6 years ago
crish ff2fb39e0a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish b422165082 MES Repository构建 6 years ago
alwaysfrin e34a84274c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 64350cce31 DdlPack,日期封装bug 6 years ago
crish bd015747a1 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 49dcd8b009 MES Repository构建 6 years ago
Silliter a13d87c246 优化任务列表和流程管家 6 years ago
crish 9dfbd97c92 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish d08b12e1d7 Mes业务表实体,增加数据类型返回为空的get方法 6 years ago
wei.peng 31d53c515c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 3b47469aad 表单功能Model 封装完成 6 years ago
crish f64d1fb89f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 3675175bf1 MES项目pojo构建 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 2357bbcde6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish d19e25fe84 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
gragon.xu 13106615ee PO明细标准包装改为Double 6 years ago
yunhao.wang c2079ed03b 系统菜单查询接口 6 years ago
crish 3bafee9fcd Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang e18d115d3a 系统菜单查询接口 6 years ago
jessica.chen 887121580b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 8e5a26bc63 修改是否指定条码枚举 6 years ago
wei.peng fd0f3ca00e 自定义表单数据接口,模型分装完成 6 years ago
wei.peng 15901e3fe1 自定义表单拦截器开发1.0完成 6 years ago
crish f0e87ae00b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 63d0178cfd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 93f4d1cfd7 发布列表接口 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
crish 3060a2f86d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
Rock.Yu 7f8d3df009 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 19b78c4148 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Rock.Yu 2aa692a9c0 1. 增加无参数的构造函数 6 years ago
alwaysfrin bec70bc79d DdlPack,数字equals添加大于0的约束 6 years ago
crish 8543318e32 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish ab124f2c29 MES业务Bean 6 years ago
yunhao.wang cbfc1b470e 平台-用户操作组织修改接口
表单-拦截器添加执行顺序
表单-功能明细前后端联调
6 years ago
jiajack a7450b71fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 3980e05d2b mes新增通用功能可配置的业务-完善 6 years ago
柯裕 7e4bcf5dff Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 0c73ad7072 移库明细新增临时字段 6 years ago
gragon.xu fbd32befea Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gragon.xu 6e4d59cf7f 根据PO单号批量生成条码 6 years ago
alwaysfrin d0cac648f3 添加update通过DdlPack 6 years ago
alwaysfrin b80cda2439 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish f981047fb4 MES实体 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 79b11c1225 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy 58ec3e9323 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy a745015be7 移库单指定条码枚举 6 years ago
amy 0d39621875 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
amy 03b28b5682 数字型字段get方法重写 6 years ago
yihang.lv 542052815b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
yihang.lv 18c6a72b3e 订单类型枚举 6 years ago
yihang.lv bb2d5f905a ids改为idsStr 6 years ago
Silliter 85210d4ca1 优化流程管家 6 years ago
yunhao.wang bb510e573d 表单布局-删除行列校验 必须保留1行1列 6 years ago
yunhao.wang 0da89fa17e 表单-布局新增行列设置初始数据
SWEB通知附件调整
定时任务日志添加所属模块
消息设置所属模块
消息微服务调用方法调整
6 years ago
yunhao.wang bd050ae3ac Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 5a4c85e409 消息附件管理 6 years ago
Silliter 5ec2caf56d 优化查询封装实体 6 years ago
yihang.lv 96f003f4a5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 556072dbaa 登录授权、发货通知 6 years ago
yunhao.wang 6d8643da0c 权限分配调整接口
消息调整添加微服务支持
添加sweb通知处理队列
6 years ago
yunhao.wang 1d9dd174e9 前端联调接口优化
单号生成工具类bug解决
6 years ago
alwaysfrin 7f10c22613 部分细节调整 6 years ago
amy b0e4f719e2 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
amy 53628e89d7 代码规范修改 6 years ago
Silliter 5acf1ac8f5 Merge branches 'dev' and 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter eedfaf7392 优化流程管家 6 years ago
crish 4925b8a79f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jessica.chen da7ce37861 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jessica.chen 3390a89b29 修改基础数据备注字段 6 years ago
crish 4dd872698b 流程管家:解决所有流程都走收获问题 6 years ago
amy fc80e34b14 代码规范修改 6 years ago
Silliter 7b276e709b 流程日志明细查询优化 6 years ago
Silliter 72e7759c8f 修改流程日志查询 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
wei.peng d70eec3967 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
yihang.lv 9802d19b2e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv f1993e69c8 sweb目录调整 6 years ago
wei.peng 82d472466b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng cc3b1a741c 元素虚拟属性封装 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
wei.peng f810e35873 自定义表单 数据操作接口 DAO 层优化 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
alwaysfrin 2df3b92103 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 9d047fa3e5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 1adc8e4baf 自定义表单 数据操作接口 DAO 层完成 6 years ago
yunhao.wang f6ed505fc4 细节优化
bug修复
6 years ago
柯裕 8e7550072b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 152bcdf9ce 优化质检明细枚举 6 years ago
yihang.lv 8338d98821 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 2fdf91f164 导入excel联调 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
yunhao.wang cb1b5f9fdb bug修复 6 years ago
yunhao.wang ea31519fdc 表单功能接口优化
文件微服接口优化
自动填充单元测试
6 years ago
wei.peng 74e89fa54e 元素增删改查 DAO层接口完成 6 years ago
wei.peng 5b0d4f8d37 元素增删改查 DAO层接口完成 6 years ago
gragon.xu 678d154b1f 需求变更:所有单据明细和条码查询条件去掉行号;生成入库单的明细的是否免费字段默认为计费 6 years ago
gragon.xu 712ec2af7e 单据状态描述 6 years ago
jimmy 11fd6979ed 盘点pc端 6 years ago
jiajack a678b75ca3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 1371f94838 熔断返回信息封装 6 years ago
alwaysfrin 87aa6644fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 76cbc39fe1 新增自动填充null值属性 6 years ago
柯裕 6f7258d49b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 edee3a7312 优化枚举 6 years ago
alwaysfrin fdb9e655c3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 6971fdbf60 删除json序列化not_empty限制 6 years ago
jiajack 3f2846bde2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack a819af268c 实体新增 6 years ago