jenkins
|
64e8d6dd9d
|
Merge remote-tracking branch 'origin/dev' into test
|
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
|
fca834958b
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jessica.chen
|
15a399e86d
|
产品发运、抽点记录、质检三张表的查询sql优化
|
6 years ago |
jiajack
|
f9f3a9858a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
6da4a6f33c
|
新增获取组织相关的业务
|
6 years ago |
|
jenkins
|
530162c0c6
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
jenkins
|
92e2b7fd84
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
yunhao.wang
|
85178af7f9
|
消息细节调整
|
6 years ago |
|
jenkins
|
4a5d0f0cb3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
7f8217e644
|
清除测试类
|
6 years ago |
|
amy
|
a91ff1feaf
|
查询优化
|
6 years ago |
|
amy
|
062d56573f
|
查询修改
|
6 years ago |
|
amy
|
06dd8b42da
|
查询优化
|
6 years ago |
yihang.lv
|
cdfc83ef39
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
cdd0e5fc05
|
消息接口修改
|
6 years ago |
|
jenkins
|
ff991142ae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
crish
|
f445b403b3
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
Silliter
|
3d56e2539d
|
合并dev代码
|
6 years ago |
|
crish
|
85ae1e2455
|
生产工单接口开发
|
6 years ago |
|
yunhao.wang
|
950c6dee36
|
附件来源
|
6 years ago |
|
yunhao.wang
|
eee0539562
|
sweb公告处理
|
6 years ago |
|
crish
|
34e6d97b27
|
生产工单
|
6 years ago |
|
jenkins
|
0cde3d8a63
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
35af22054b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
89d6ef61f4
|
盘点加
|
6 years ago |
|
jenkins
|
fb4be4580d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
gragon.xu
|
1a8a6418d8
|
物料分页查询条件加上“snControl”
|
6 years ago |
|
gragon.xu
|
4309aeb997
|
d
|
6 years ago |
|
gragon.xu
|
3926ba11c1
|
监控台
|
6 years ago |
|
gragon.xu
|
e033083f9e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
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 |
|
jenkins
|
15d53b47ec
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
Silliter
|
ac70ce91fd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jiajack
|
8227353cbd
|
工位程序编写
|
6 years ago |
|
Silliter
|
8d1567a0b5
|
根据任务关联单号模糊匹配任务列表
|
6 years ago |
|
Silliter
|
5abb5d1821
|
任务列表优化
|
6 years ago |
|
Silliter
|
83ce4f0efb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
jenkins
|
df63afecf8
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
Silliter
|
0c12793473
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
Silliter
|
b0cb1b795b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
6b25e77793
|
监控台模拟数据+不同库存数量接口修改
|
6 years ago |
|
gragon.xu
|
311eaf979a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
Silliter
|
28e43c087b
|
合并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 |
|
Silliter
|
6cb456fcc4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |