gragon.xu
|
ec9764d3d7
|
d
|
6 years ago |
yiming.gu
|
750fed1966
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yiming.gu
|
3112e5e72c
|
生产工单实体添加注解
|
6 years ago |
|
gragon.xu
|
e7071ad41c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
186a9ccb0d
|
监控台
|
6 years ago |
Silliter
|
f0e2b3910c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
afac75bb2b
|
质检明细删除问题修改
看板卡新的moveno生成问题
任务操作问题
校验库容问题
|
6 years ago |
yihang.lv
|
8f90949525
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
6ea6b3d54b
|
请求路径修改，系统配置表增删改查
|
6 years ago |
jiajack
|
8227353cbd
|
工位程序编写
|
6 years ago |
|
Silliter
|
8d1567a0b5
|
根据任务关联单号模糊匹配任务列表
|
6 years ago |
|
Silliter
|
5abb5d1821
|
任务列表优化
|
6 years ago |
|
Silliter
|
588a517ae1
|
任务列表接口优化
|
6 years ago |
crish
|
063e48782f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
a62ead1c25
|
Mes生产计划，生产工单
|
6 years ago |
|
yihang.lv
|
0c3c399117
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
461aa2fc1b
|
供应商条码打印，非标导入，excelutil空行判断
|
6 years ago |
|
gragon.xu
|
9b014a28ce
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
0744d38714
|
质检基础数据前后端调整：去掉入库单号，把关联单号作为查询条件；数据不可操作
|
6 years ago |
wei.peng
|
ef109e185d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
c119c06130
|
自定义表单 使用Redis 1.0 功能完成
|
6 years ago |
柯裕
|
e78a78d636
|
解决冲突
|
6 years ago |
|
柯裕
|
ee33834f9a
|
优化
|
6 years ago |
|
gragon.xu
|
6204ff8538
|
#3961+MASTER_ORDER_NO枚举添加Code
|
6 years ago |
|
gragon.xu
|
2e5bad22cc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
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 |