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

gavel/src/main/java/com/gavel/kwell/controller/KmesBoardController.java

@@ -145,13 +145,13 @@ public class KmesBoardController extends BaseController {
         FileInputStream fileInputStream = kmesBoardService.getVideo();
         kmesBoardService.doAttachmentPreview(response, fileInputStream);
     }
-    
+
     @RequestMapping(value = "/querySafeDays", method = RequestMethod.POST)
     @ResponseBody
     public Object querySafeDays(@RequestBody JSONObject param) {
         return buildReturnData(kmesBoardService.querySafeDays());
     }
-    
+
     @RequestMapping(value = "/queryCurProZtsl", method = RequestMethod.POST)
     @ResponseBody
     public Object queryCurProZtsl(@RequestBody JSONObject param) {

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java

@@ -125,8 +125,8 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
         sqlMap.append("from GPFKJG  ");
         sqlMap.append("  left join WOGYLX on WOGYLX_ID = GPFKJG_FKGX ");
         sqlMap.append("where (GPFKJG_FKSJ >= :pStart and GPFKJG_FKSJ < :pEnd) and  (WOGYLX_GXBZ = :pDGxbz or WOGYLX_GXBZ = :pMGxbz) ");//[a,b)
-        sqlMap.setParamValue("pStart", start);
-        sqlMap.setParamValue("pEnd", end);
+        sqlMap.setParamValue("pStart", DateUtils.beginOfDay(start));
+        sqlMap.setParamValue("pEnd", DateUtils.endOfDay(end));
         sqlMap.setParamValue("pDGxbz", GxlxGxbzEnum.ONLY.getId());
         sqlMap.setParamValue("pMGxbz", GxlxGxbzEnum.LAST.getId());
         return sqlMap.query(Gpfkjg.class);
@@ -152,7 +152,7 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
     @Override
     public Gpfkjg queryWeekGpfk(Date date,String woid) {
         SqlMap sqlMap = new SqlMap();
-        sqlMap.append("select sum(GPFKJG_FKSL) as GPFK_FKSL ");
+        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  ");

gavel/src/main/java/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java

@@ -12,7 +12,6 @@ import com.gavel.kwell.service.KmesBoardService;
 import com.gavel.kwell.utils.DateCalculateUtil;
 import com.gavel.kwell.utils.KwellParamEnum;
 import com.gavel.kwell.vo.*;
-import com.gavel.wo.persistent.Pcjhmx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +39,7 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
 
     @Autowired
     private GpfkcxDao gpfkcxDao;
-    
+
     @Autowired
     private CommonService commonService;
 
@@ -96,25 +95,22 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
 
     @Override
     public List<PcslVO> queryWeekPcsl() {
-        Date beginDate = DateUtils.calcDate(DateUtils.getDate(),0,0,-7,0,0,0);
-        Date endDate = DateUtils.calcDate(DateUtils.getDate(),0,0,-1,0,0,0);
+        Date beginDate = DateUtils.calcDate(DateUtils.getDate(),0,0,-6,0,0,0);
+        Date endDate = DateUtils.calcDate(DateUtils.getDate(),0,0,0,0,0,0);
         List<Date> dateList = DateCalculateUtil.findDates("D", beginDate, endDate);
         List<PcslVO> pcslVOList = new ArrayList<>();
         for(Date date : dateList){
             PcslVO pcslVO = new PcslVO();
-            Pcjhmx pcjhmx = kmesBoardDao.queryWeekPcsl(date);
             List<Gpfkjg> gpfks = queryByBetween(date,date);
             double wgsl =0.0;
+            double hgsl =0.0;
             if(gpfks != null && gpfks.size()>0){
                 wgsl = gpfks.stream().mapToDouble(Gpfkjg::getFksl).sum();//每一天
-            }
-            if(pcjhmx != null){
-                pcslVO.setJhsl(pcjhmx.getJhsl()==null?0.0:pcjhmx.getJhsl());
-            }else {
-                pcslVO.setJhsl(0.0);
+                hgsl = gpfks.stream().mapToDouble(Gpfkjg::getHgsl).sum();//每一天
             }
             pcslVO.setPcrq(date);
-            pcslVO.setWgsl(wgsl);
+            pcslVO.setJhsl(wgsl);//完工数量
+            pcslVO.setWgsl(hgsl);//合格数量
             pcslVOList.add(pcslVO);
         }
         return pcslVOList;
@@ -172,8 +168,8 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
     public List<GpfkHgVO> queryGpfkHgl() {
         //首到工序的工票反馈最近7天合格率
 
-        Date beginDate = DateUtils.calcDate(DateUtils.getDate(),0,0,-7,0,0,0);
-        Date endDate = DateUtils.calcDate(DateUtils.getDate(),0,0,-1,0,0,0);
+        Date beginDate = DateUtils.calcDate(DateUtils.getDate(),0,0,-6,0,0,0);
+        Date endDate = DateUtils.calcDate(DateUtils.getDate(),0,0,0,0,0,0);
         List<Date> dateList = DateCalculateUtil.findDates("D", beginDate, endDate);
         List<GpfkHgVO> gpfkHgVOList = new ArrayList<>();
         String gxbz = commonService.getStringOptionValue(KwellParamEnum.DASHBOARD_HGL.getId());

gavel/src/main/resources/static/js/dashboard/echarts.js

@@ -2525,6 +2525,9 @@ function setPieDailyChart(chart, cerpent, pdata) {
 	apidata.wgsl = 0
 	if (pdata) {
 		apidata = pdata
+		if(apidata.wgsl>apidata.jhsl){
+			apidata.wgsl=pidata.jhsl
+		}
 	}
 	var ops = {
 		color: ["#A2E9FF", "#409eff"],

gavel/src/main/resources/templates/views/kmes/gphy/index.html

@@ -182,10 +182,9 @@
 				window.location.href ="loginscan_view"; 
 				return
 			}
-			zpfk_apigetjs(that)
 			zpfk_apizpfk(that).then(function(s){
 						zpfk_queryWoBomByWoid(that,s)
-						zpfk_pdfshow(that,s)
+						zpfk_apigetjs(that)
 					})
 			//
 		}
@@ -491,6 +490,7 @@
 			let Vkwrkb01 = new Vue({
 				el: "#kwrkb01",
 				mounted() {
+					zpfk_apigetjs(this)
 					zpfk_getgx(this)
 					this.initpage()
 					dbenlarge('kwrkb01', 1, this.initpage)

gavel/src/main/resources/templates/views/kmes/gpjy/index.html

@@ -93,6 +93,8 @@
 				gas.post('kmes/gpfk/getDailyInfo',{"bzgxid":window.bzlx}, function(res){
 					if(res.data&&res.data.records){
 					that.fksl=res.data.records.fksl||0
+					that.hg=res.data.records.hgsl||0
+					that.ng=res.data.records.bhgsl||0
 					}else{
 					let msg=res.message||"当前计数获取失败"
 					jyfk_wrz(that,msg,'error')	
@@ -106,8 +108,8 @@
 					gas.post('kmes/gpfk/jyfk ',{"sncode":that.xlh,"bzgxid":window.bzlx||"","wosncode":that.wosncode||""}, function(res){
 					if(res.data&&res.data.records){
 					/* 赋值操作 */
-					that.hg= res.data.records.hgsl||0;
-					that.ng= res.data.records.bhgsl||0;
+					// that.hg= res.data.records.hgsl||0;
+					// that.ng= res.data.records.bhgsl||0;
 					that.gd =  res.data.records.woDjid;
 					     that.cpsn = res.data.records.wosnCode;
 					     that.ph = res.data.records.wlxxCode;
@@ -122,12 +124,12 @@
 						jyfk_wrz(that,msg)	
 					}else if(res.data.records.sntype=="OKBZ"){
 						that.isok="OK"
-						that.hg=res.data.records.hgsl||0;
-						that.ng=res.data.records.bhgsl||0;
+						// that.hg=res.data.records.hgsl||0;
+						// that.ng=res.data.records.bhgsl||0;
 					}else if(res.data.records.sntype=="NGBZ"){
 						that.isok="NG"
-						that.hg=res.data.records.hgsl||0;
-						that.ng=res.data.records.bhgsl||0;
+						// that.hg=res.data.records.hgsl||0;
+						// that.ng=res.data.records.bhgsl||0;
 					}
 					that.xlh=""
 					/* 日志操作 */
@@ -151,10 +153,9 @@
 					window.location.href ="loginscan_view"; 
 					return
 				}
-				jyfk_apigetjs(that)
 				jyfk_wrz(that,"正在查询序列号:"+that.xlh)
 				jyfk_apijyfk(that).then(function(s){
-							jyfk_pdfshow(that,s)
+							jyfk_apigetjs(that)
 						})
 			}
 			/* jyfk */
@@ -432,6 +433,7 @@
 			el:"#kwrkb04",
 			mounted() {
 				jyfk_getgx(this)
+				jyfk_apigetjs(this)
 				dbenlarge('kwrkb04',1,this.isFocus())
 				// this.sivpdf=
 				this.initpage()

gavel/src/main/resources/templates/views/kmes/gpwx/index.html

@@ -109,6 +109,8 @@
 				gas.post('kmes/gpfk/getDailyInfo',{"bzgxid":window.bzlx}, function(res){
 					if(res.data&&res.data.records){
 					that.fksl=res.data.records.fksl||0
+					that.hg=res.data.records.hgsl||0
+					that.ng=res.data.records.bhgsl||0
 					}else{
 					let msg=res.message||"当前计数获取失败"
 					wxfk_wrz(that,msg,'error')	
@@ -122,8 +124,8 @@
 					gas.post('kmes/gpfk/wxfk ',{"sncode":that.xlh,"bzgxid":window.bzlx||"","wosncode":that.wosncode||""}, function(res){
 					if(res.data&&res.data.records){
 					/* 赋值操作 */
-					that.hg= res.data.records.hgsl||0;
-					that.ng= res.data.records.bhgsl||0;
+					// that.hg= res.data.records.hgsl||0;
+					// that.ng= res.data.records.bhgsl||0;
 					that.gd =  res.data.records.woDjid;
 					     that.cpsn = res.data.records.wosnCode;
 					     that.ph = res.data.records.wlxxCode;
@@ -138,12 +140,12 @@
 						wxfk_wrz(that,msg)	
 					}else if(res.data.records.sntype=="OKBZ"){
 						that.isok="OK"
-						that.hg=res.data.records.hgsl||0;
-						that.ng=res.data.records.bhgsl||0;
+						// that.hg=res.data.records.hgsl||0;
+						// that.ng=res.data.records.bhgsl||0;
 					}else if(res.data.records.sntype=="NGBZ"){
 						that.isok="NG"
-						that.hg=res.data.records.hgsl||0;
-						that.ng=res.data.records.bhgsl||0;
+						// that.hg=res.data.records.hgsl||0;
+						// that.ng=res.data.records.bhgsl||0;
 					}
 					that.xlh=""
 					/* 日志操作 */
@@ -167,10 +169,10 @@
 					window.location.href ="loginscan_view"; 
 					return
 				}
-				wxfk_apigetjs(that)
+				
 				wxfk_wrz(that,"正在查询序列号:"+that.xlh)
 				wxfk_apiwxfk(that).then(function(s){
-							wxfk_pdfshow(that,s)
+							wxfk_apigetjs(that)
 						})
 			}
 			/* wxfk */
@@ -440,6 +442,7 @@
 			el:"#kwrkb07",
 			mounted() {
 				wxfk_getgx(this)
+				wxfk_apigetjs(this)
 				dbenlarge('kwrkb07',1,this.isFocus())
 				// this.sivpdf=
 				this.initpage()

gavel/src/main/resources/templates/views/kmes/jgfk/index.html

@@ -91,6 +91,8 @@
 			gas.post('kmes/gpfk/getDailyInfo',{"bzgxid":window.bzlx}, function(res){
 				if(res.data&&res.data.records){
 				that.fksl=res.data.records.fksl||0
+				that.hg=res.data.records.hgsl||0
+				that.ng=res.data.records.bhgsl||0
 				}else{
 				let msg=res.message||"当前计数获取失败"
 				jgfk_wrz(that,msg,'error')	
@@ -117,8 +119,8 @@
 				gas.post('kmes/gpfk/jgfk',{"sncode":that.xlh,"bzgxid":window.bzlx||"","wosncode":that.wosncode||""}, function(res){
 					if(res.data&&res.data.records){
 					/* 赋值操作 */
-					that.hg= res.data.records.hgsl||0;
-					that.ng= res.data.records.bhgsl||0;
+					// that.hg= res.data.records.hgsl||0;
+					// that.ng= res.data.records.bhgsl||0;
 					that.gd =  res.data.records.woDjid;
 					     that.cpsn = res.data.records.wosnCode;
 					     that.ph = res.data.records.wlxxCode;
@@ -133,12 +135,12 @@
 						jgfk_wrz(that,msg)	
 					}else if(res.data.records.sntype=="OKBZ"){
 						that.isok="OK"
-						that.hg=res.data.records.hgsl||0;
-						that.ng=res.data.records.bhgsl||0;
+						// that.hg=res.data.records.hgsl||0;
+						// that.ng=res.data.records.bhgsl||0;
 					}else if(res.data.records.sntype=="NGBZ"){
 						that.isok="NG"
-						that.hg=res.data.records.hgsl||0;
-						that.ng=res.data.records.bhgsl||0;
+						// that.hg=res.data.records.hgsl||0;
+						// that.ng=res.data.records.bhgsl||0;
 					}
 					that.xlh=""
 					/* 日志操作 */
@@ -163,10 +165,11 @@
 				window.location.href ="loginscan_view"; 
 				return
 			}
-			jgfk_apigetjs(that)
+			
 			jgfk_apijgfk(that).then(function(s){
-						jgfk_queryWoBomByWoid(that,s)
-					})
+				jgfk_apigetjs(that)
+				jgfk_queryWoBomByWoid(that,s)
+				})
 			//
 		}
 		/* wobom查询  .then(e=>执行) */
@@ -339,6 +342,7 @@
 				el: "#jgfkkb",
 				mounted() {
 					jgfk_getgx(this)
+					jgfk_apigetjs(this)
 					this.initpage()
 					dbenlarge('jgfkkb', 1, this.initpage)
 					$(this.el).dblclick()