yiming.gu
|
494fc4aa70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
486dda639f
|
pcn队列pojo vin字段改为string型
|
6 years ago |
柯裕
|
ba368a0327
|
ANDON更新
|
6 years ago |
|
柯裕
|
8ccc265f0d
|
ANDON枚举更新
|
6 years ago |
|
柯裕
|
1977dc230b
|
ANDON实体创建
|
6 years ago |
|
柯裕
|
1b702d0821
|
ANDON_HQLPACK更新
|
6 years ago |
Silliter
|
c9c470a27f
|
开发物理安灯业务
|
6 years ago |
|
Silliter
|
da56d45a68
|
安灯项目优化
|
6 years ago |
|
Silliter
|
47bd2c0aa7
|
安灯项目开发
|
6 years ago |
|
柯裕
|
4895b3ae85
|
ANDON实体更新
|
6 years ago |
|
柯裕
|
02281095ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
0e090c7e08
|
优化POJO
|
6 years ago |
|
yiming.gu
|
9281b74453
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
f844f89f5d
|
andon新增班次表
|
6 years ago |
yihang.lv
|
263fa2be19
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
fe23d7003f
|
sweb po详情级联查询重写，发布订单接口重写
|
6 years ago |
|
柯裕
|
060fa564da
|
更新AndonHqlPack
|
6 years ago |
|
Silliter
|
81b03ff299
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
68a66c67b0
|
设备pojo新增工作中心代码，区域代码
|
6 years ago |
|
yiming.gu
|
15b5edfaec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
b1f513d786
|
新增设备pojo，组织模型model
|
6 years ago |
|
Silliter
|
4c11c1645d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
alwaysfrin
|
31bdf2561a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
6d8e0f6c82
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
e02f61c51f
|
安灯项目优化
|
6 years ago |
|
alwaysfrin
|
5fa2b67880
|
安灯源码位置错误，重新调整
|
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 |
|
柯裕
|
a11d2c04d5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
f6c90bd96b
|
ANDON创建dao
|
6 years ago |
|
Silliter
|
7f8c0303fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
f89090c40e
|
按灯项目实体创建
|
6 years ago |
|
柯裕
|
97aa0ea44c
|
ANDON实体创建
|
6 years ago |
crish
|
dd477bdf94
|
生产计划
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
571ad144b7
|
解决冲突
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
47ab4c7a45
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
e38a7de8ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
 曾贞一
|
c84df68fac
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
81821c70a8
|
移库单 生成条码问题
|
6 years ago |
|
柯裕
|
9ee049e086
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
5ef8089c02
|
ANDON实体创建
|
6 years ago |
|
柯裕
|
30db0904a4
|
ANDON实体创建
|
6 years ago |
|
Silliter
|
2b37ad77c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
c5093b073c
|
安灯实体优化
|
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
|
24af646ad8
|
安灯项目开发环境搭建
|
6 years ago |
|
Silliter
|
10844622a7
|
1.优化查询语句
2.流程管家查询条件加上工厂字段
|
6 years ago |
|
yihang.lv
|
58bc54f3c6
|
sweb 订单发布代码修改bug
|
6 years ago |
|
crish
|
c771fa925b
|
更改model位置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yihang.lv
|
e0383285b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
e93605135c
|
sweb 发布列表重写
|
6 years ago |
|
许心洁
|
c03810358b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
58c29f5aee
|
作业流程接口+作业组件接口联调优化
|
6 years ago |
wei.peng
|
7349c5fb3a
|
添加注释
|
6 years ago |
|
alwaysfrin
|
f343ea865c
|
安灯和硬件适配初始化
|
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 |
|
Silliter
|
b2c5494983
|
联调系统配置接口
|
6 years ago |
|
jimmy
|
fc15efe67c
|
开发业务类型增删改查接口
|
6 years ago |
jiajack
|
7728bbf61c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
9137fe9c4f
|
工位程序业务编写
|
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
|
b44a178ec6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
f39abebd90
|
qc HQL修改
|
6 years ago |
|
jiajack
|
d6c7e39989
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
038484e7ac
|
工步调度业务完善
|
6 years ago |
yunhao.wang
|
099a58a14d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
7e8730ea9f
|
自定义按钮功能接口
消息优化
|
6 years ago |
|
crish
|
5daf6d960f
|
hqpPack优化
Signed-off-by: crish <570360737@qq.com>
|
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 |
|
刘敏
|
f333718801
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
b61a2bbea7
|
实体数字类型get方法重写
|
6 years ago |
|
yiming.gu
|
a1a63c2247
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
feace14920
|
PCN同步MES主数据
|
6 years ago |
|
alwaysfrin
|
005527f659
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
cb628b0125
|
事务持久化调整
|
6 years ago |
|
wei.peng
|
0aaa8112a8
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
|
wei.peng
|
97d1f1332c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
d1ac366574
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
|
yihang.lv
|
4389617168
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
e790b209e5
|
sweb开窗改为微服务
|
6 years ago |
|
jiajack
|
bb2bd61053
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
78c3ff3a47
|
工步调度业务完善
|
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 |
|
crish
|
6c2e1c2d85
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
7fc2fe8914
|
生产计划，生产工单，生产队列
Signed-off-by: crish <570360737@qq.com>
|
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
|
9241fbdce9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
b3f4ccbb78
|
自定义脚本开发
|
6 years ago |
|
alwaysfrin
|
7a4f014aa8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
bb922f42fb
|
配置文件调整
|
6 years ago |
|
jimmy
|
bb811306ff
|
修改 wmsShopping 为 wmsShipping
|
6 years ago |
|
yihang.lv
|
b76ccb43d2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
7da6627878
|
sweb通知公告
|
6 years ago |
|
crish
|
82de566e90
|
封装字符串>= <=查询
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
976a37bff6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
e4c1f3ae72
|
生产队列
Signed-off-by: crish <570360737@qq.com>
|
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
|
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 |
|
柯裕
|
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 |
|
yunhao.wang
|
85178af7f9
|
消息细节调整
|
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 |
|
crish
|
f445b403b3
|
Merge remote-tracking branch 'origin/dev' into 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 |
|
Silliter
|
35af22054b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
89d6ef61f4
|
盘点加
|
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 |
|
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 |