Skip to content

K
kwell-mes
Commit 5fd37c1f authored by 李苏's avatar 李苏 💬
Browse files
Options

Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

parents 95a1572c 7e7ccc22
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 13 deletions
gavel/src/main/java/com/gavel/kwell/controller/KmesBoardController.java
View file @ 5fd37c1f
......@@ -172,4 +172,16 @@ public class KmesBoardController extends BaseController {
}
@RequestMapping(value = "/queryZscl", method = RequestMethod.POST)
@ResponseBody
public Object queryZcl(@RequestBody JSONObject param) {
try {
return buildReturnData(kmesBoardService.queryZcl());
} catch (Exception e) {
ThreadContext.getReturnData().setSuccess(false);
ThreadContext.getReturnData().setMessage(e.getMessage());
}
return ThreadContext.getReturnData();
}
}
gavel/src/main/java/com/gavel/kwell/dao/GpfkcxDao.java
View file @ 5fd37c1f
......@@ -27,4 +27,6 @@ public interface GpfkcxDao extends BaseDao {
public Gpfkjg queryWeekGpfk(Date date,String woid);
public Gpfkjg queryMonthGpfk(Date date);
public Gpfkjg queryZGpfk(Date date);
}
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ 5fd37c1f
......@@ -1847,6 +1847,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
SqlMap sqlMap = new SqlMap();
sqlMap.append(" select sum(gpfkjg_fksl) as GPFK_FKSL, sum(GPFKJG_BHGSL) as GPFK_BHGSL, sum(GPFKJG_HGSL) as GPFK_HGSL from gpfkjg ");
sqlMap.append(" left join bzgx on bzgx_id = gpfkjg_bzgxid ");
sqlMap.append(" left join users on users_id = GPFKJG_FKRID ");
sqlMap.append(" where 1 = 1");
//sqlMap.append(" and (bzgx_gxlx ='ZP' or bzgx_gxlx ='JG') ");
if (StringUtils.isNotEmpty(condition.getBxid())){
......@@ -1858,7 +1859,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.setParamValue("pBZGXID",condition.getBzgxid());
}
if (StringUtils.isNotEmpty(condition.getFkrid())){
sqlMap.append(" and GPFKJG_FKRID = :pFKRID ");
sqlMap.append(" and (GPFKJG_FKRID = :pFKRID or users_userid = :pFKRID)");
sqlMap.setParamValue("pFKRID",condition.getFkrid());
}
if (condition.getYwrq() != null) {
......
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java
View file @ 5fd37c1f
......@@ -187,5 +187,19 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
sqlMap.setParamValue("pMGxbz", GxlxGxbzEnum.LAST.getId());
return sqlMap.queryEntity(Gpfkjg.class);
}
@Override
public Gpfkjg queryZGpfk(Date date) {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select sum(GPFKJG_FKSL) as GPFKJG_FKSL ");
sqlMap.append("from GPFKJG ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFKJG_FKGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append("where 1=1 and GPFKJG_FKSJ < :pEnd and (WOGYLX_GXBZ = :pDGxbz or WOGYLX_GXBZ = :pMGxbz) ");
sqlMap.setParamValue("pEnd", DateUtils.endOfMonth(date));
sqlMap.setParamValue("pDGxbz", GxlxGxbzEnum.ONLY.getId());
sqlMap.setParamValue("pMGxbz", GxlxGxbzEnum.LAST.getId());
return sqlMap.queryEntity(Gpfkjg.class);
}
}
gavel/src/main/java/com/gavel/kwell/service/KmesBoardService.java
View file @ 5fd37c1f
......@@ -40,4 +40,6 @@ public interface KmesBoardService extends BaseEditService {
public Map<String,Object> queryCurrentMadeZtsl();
public KqtjVO queryOA();
public PcslVO queryZcl();
}
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ 5fd37c1f
......@@ -1631,6 +1631,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid());
......@@ -1657,6 +1659,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid());
......@@ -1737,6 +1741,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
if(curFkVo==null) {
throwReturnMessage("该订单不存在对应工序，请重新确认！");
}
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
GphyCondition hyCondition =new GphyCondition();
hyCondition.setBzgxid(fkCondition.getBzgxid());
hyCondition.setWosncode(fkCondition.getWosncode());
......@@ -1827,6 +1833,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid());
......@@ -1853,6 +1861,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid());
......@@ -2102,6 +2112,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid());
......@@ -2128,6 +2140,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
Gpfk gpfk = new Gpfk();
FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
gpfk.setWosnid(curFkVo.getWosnCode());
gpfk.setWogylx(curFkVo.getWogylxid());
gpfk.setFkgx(curFkVo.getWogylxid());
......
gavel/src/main/java/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java
View file @ 5fd37c1f
......@@ -139,11 +139,9 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
pcslVO.setJhsl(0.0);
}
Gpfkjg gpfkjg = gpfkcxDao.queryMonthGpfk(new Date());
double wgsl =0.0;
if(gpfkjg != null){
pcslVO.setWgsl(gpfkjg.getFksl()==null?0.0:gpfkjg.getFksl());
}
pcslVO.setWgsl(wgsl);
return pcslVO;
}
......@@ -293,11 +291,11 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
cecount = kmesBoardDao.queryZtsl(ceids);
}
if(StringUtils.isNotEmpty(lhztIdsStr)) {
String[] lhids = zpztIdsStr.split(",");
String[] lhids = lhztIdsStr.split(",");
lhcount = kmesBoardDao.queryZtsl(lhids);
}
if(StringUtils.isNotEmpty(jyztIdsStr)) {
String[] jyids = zpztIdsStr.split(",");
String[] jyids = jyztIdsStr.split(",");
jycount = kmesBoardDao.queryZtsl(jyids);
}
maps.put(KwellParamEnum.DASHBOARD_ZPZT.getId(), zpcount);
......@@ -344,4 +342,15 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
}
@Override
public PcslVO queryZcl() {
PcslVO pcslVO = new PcslVO();
Gpfkjg gpfkjg = gpfkcxDao.queryZGpfk(new Date());
if(gpfkjg != null){
pcslVO.setWgsl(gpfkjg.getFksl()==null?0.0:gpfkjg.getFksl());
}
return pcslVO;
}
}
gavel/src/main/resources/templates/views/kmes/dashboard/first.html
View file @ 5fd37c1f
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>KEWELL车间作业及质量看板</title>
<title>数字化生产信息平台</title>
<link rel="stylesheet" href="../../css/dashboard/wodry.css">
<link rel="stylesheet" href="../../css/dashboard/index.css">
<link rel="stylesheet" href="../../css/dashboard/public.css">
......
gavel/src/main/resources/templates/views/kmes/dashboard/fourth.html
View file @ 5fd37c1f
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>KEWELL车间作业及质量看板</title>
<title>数字化生产信息平台</title>
<link rel="stylesheet" href="../../css/dashboard/wodry.css">
<link rel="stylesheet" href="../../css/dashboard/index.css">
<link rel="stylesheet" href="../../css/dashboard/public.css">
......@@ -41,7 +41,7 @@
<div class="header-center fr">
<div class="header-title" style="display: flex;align-content:center;flex-wrap: wrap;">
<div style="width: 100%;height: 50%;">
数字化柔性自动生产车间看板
数字化生产信息平台
</div>
<div id="aqscts" style="width: 100%;font-size: .2rem;height: .3rem;line-height: .3rem;margin-top: -0.2rem;">
安全生产天数:0
......
gavel/src/main/resources/templates/views/kmes/dashboard/index.html
View file @ 5fd37c1f
......@@ -6,7 +6,7 @@
<!--<img src="./images/guohui.png" alt="">-->
</p>
<p class="p2"></p>
<p class="p3">KEWELL车间作业及质量看板</p>
<p class="p3">数字化生产信息平台</p>
</div>
<div class="contain">
<ul>
......
gavel/src/main/resources/templates/views/kmes/dashboard/second.html
View file @ 5fd37c1f
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>KEWELL车间作业及质量看板</title>
<title>数字化生产信息平台</title>
<link rel="stylesheet" href="../../css/dashboard/wodry.css">
<link rel="stylesheet" href="../../css/dashboard/index.css">
<link rel="stylesheet" href="../../css/dashboard/public.css">
......@@ -15,7 +15,7 @@
<div class="header-center fr">
<div class="header-title" style="display: flex;align-content:center;flex-wrap: wrap;">
<div style="width: 100%;height: 50%;">
数字化柔性自动生产车间看板
数字化生产信息平台
</div>
<div id="aqscts" style="width: 100%;font-size: .2rem;height: .3rem;line-height: .3rem;margin-top: -0.2rem;">
安全生产天数:0
......
gavel/src/main/resources/templates/views/kmes/dashboard/third.html
View file @ 5fd37c1f
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>KEWELL车间作业及质量看板</title>
<title>数字化生产信息平台</title>
<link rel="stylesheet" href="../../css/dashboard/wodry.css">
<link rel="stylesheet" href="../../css/dashboard/index.css">
<link rel="stylesheet" href="../../css/dashboard/public.css">
......@@ -29,7 +29,7 @@
<div class="header-center fr">
<div class="header-title" style="display: flex;align-content:center;flex-wrap: wrap;">
<div style="width: 100%;height: 50%;">
数字化柔性自动生产车间看板
数字化生产信息平台
</div>
<div id="aqscts" style="width: 100%;font-size: .2rem;height: .3rem;line-height: .3rem;margin-top: -0.2rem;">
安全生产天数:0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment