装配模块

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

 package com.gavel.kwell.controller;
 
+import java.io.FileInputStream;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gavel.common.BaseURL;
 import com.gavel.common.SystemOperation;
@@ -11,24 +26,21 @@ import com.gavel.common.utils.BooleanEnum;
 import com.gavel.common.utils.DateUtils;
 import com.gavel.common.utils.StringUtils;
 import com.gavel.common.utils.ThreadContext;
+import com.gavel.file.vo.FilesVO;
+import com.gavel.gygl.vo.BzgxVO;
+import com.gavel.kwell.persistent.Gpfk;
 import com.gavel.kwell.service.GpfkService;
 import com.gavel.kwell.utils.SmCodeModel;
-import com.gavel.kwell.vo.*;
+import com.gavel.kwell.vo.GpResVO;
+import com.gavel.kwell.vo.GpbhgfkCondition;
+import com.gavel.kwell.vo.GpbhgmxVO;
+import com.gavel.kwell.vo.GpfkCondition;
+import com.gavel.kwell.vo.GpfkVO;
+import com.gavel.kwell.vo.HzWoVO;
 import com.gavel.persistence.sql.RecordSet;
 import com.gavel.wo.vo.WobomVO;
 
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
 
 @Controller
 @RequestMapping("kmes/gpfk")
@@ -36,7 +48,7 @@ public class GpfkController extends BaseController {
 
     @Autowired
     private GpfkService gpfkService;
-
+    
     @ResourcePermissions()
     @RequestMapping("/index")
     public String index() {
@@ -259,13 +271,14 @@ public class GpfkController extends BaseController {
     @ResponseBody
     public Object getKwellSninfo(@RequestBody JSONObject param) {
         String wosnid = param.getString("wosnid");
+        String bzlx = param.getString("bzlx");
         if(StringUtils.isEmpty(wosnid)){
             setReturnMessage("条码不允许为空！");
             return returnData();
         }
-        HzWoVO woVO = gpfkService.queryKwellWoBySnid(wosnid);
-        if(woVO != null){
-            return buildReturnData(woVO);
+        Gpfk gpfk = gpfkService.queryKwellWosnWithAddGpfk(wosnid, bzlx);
+        if(gpfk != null){
+            return buildReturnData(gpfk);
         }else{
             return ThreadContext.getReturnData();
         }
@@ -288,26 +301,58 @@ public class GpfkController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "扫码直接进行反馈")
-    @RequestMapping(value = "/doKwellGpfk", method = RequestMethod.POST)
+    @ApiOperation(value = "扫码获取当前工票的操作附件")
+    @RequestMapping(value = "/queryPdfByWoidAndZpgx/{woid}/{bzlx}")
+    public void doKwellGpfk(HttpServletRequest request, HttpServletResponse response, @PathVariable String woid, @PathVariable String bzlx){
+    	FilesVO file = gpfkService.queryWoGylxFj(woid, bzlx);
+    	if(file !=null) {
+    		FileInputStream fileInputStream = attachmentService.download(file.getId());
+            doAttachmentPreview(file.getId(), response, fileInputStream);
+    	}
+    	
+    }
+    
+    
+    @RequestMapping(value = "/jyfk", method = RequestMethod.POST)
     @ResponseBody
-    public Object doKwellGpfk(@RequestBody GpbhgfkCondition gpbhgfkCondition){
-
-        GpfkVO gpfkInfo  = gpbhgfkCondition.getGpfkVO();
-        if(gpfkInfo == null || StringUtils.isEmpty(gpfkInfo.getWosnid())){
-            setReturnMessage("条码信息不允许为空，请检查！");
-            return null;
+    public Object jyfk(@RequestBody JSONObject param) {
+        String fkid = param.getString("fkid");
+        String hgsn = param.getString("hgsn");
+        if(StringUtils.isEmpty(fkid)||StringUtils.isEmpty(hgsn)){
+            setReturnMessage("参数错误");
+            return returnData();
         }
-        /**
-         * 合格的不启动事务
-         */
-        if(BooleanEnum.equalsYes(gpfkInfo.getHgbz())){
-            GpResVO gpResVO = gpfkService.doHgGpfk(gpbhgfkCondition);
-            return buildReturnData(gpResVO);
-        }else{
-            GpResVO gpResVO = gpfkService.doBhgGpfk(gpbhgfkCondition);
-            return buildReturnData(gpResVO);
+        gpfkService.jyfk(fkid, hgsn);
+        return ThreadContext.getReturnData();
+    }
+    
+    @RequestMapping(value = "/wxfk", method = RequestMethod.POST)
+    @ResponseBody
+    public Object wxfk(@RequestBody JSONObject param) {
+        String fkid = param.getString("fkid");
+        String hgsn = param.getString("hgsn");
+        if(StringUtils.isEmpty(fkid)||StringUtils.isEmpty(hgsn)){
+            setReturnMessage("参数错误");
+            return returnData();
         }
+        gpfkService.wxfk(fkid, hgsn);
+        return ThreadContext.getReturnData();
+    }
+    
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    @ResponseBody
+    public Object login(@RequestBody JSONObject param) {
+        String usersn = param.getString("usersn");
+        String bzgxsn = param.getString("bzgxsn");
+        if(StringUtils.isEmpty(usersn)||StringUtils.isEmpty(bzgxsn)){
+            setReturnMessage("参数错误");
+            return returnData();
+        }
+        BzgxVO bzgx = gpfkService.login(usersn, bzgxsn);
+        if(bzgx!=null) {
+        	return buildReturnData(bzgx);
+        }
+        return ThreadContext.getReturnData();
     }
 
 }

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

 package com.gavel.kwell.controller;
 
-import com.gavel.common.SystemOperation;
-import com.gavel.common.annotation.ResourcePermissions;
-import com.gavel.common.base.controller.BaseController;
-import com.gavel.kwell.service.GpfkService;
-import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.gavel.common.SystemOperation;
+import com.gavel.common.annotation.ResourcePermissions;
+import com.gavel.common.base.controller.BaseController;
+import com.gavel.common.utils.ThreadContext;
+import com.gavel.kwell.service.GphyService;
+import com.gavel.kwell.vo.GphyCondition;
 
 
 @Controller
 @RequestMapping("kmes/gphy")
 public class GphyController extends BaseController {
 
+    
     @Autowired
-    private GpfkService gpfkService;
+    private GphyService gphyService;
+
 
     @ResourcePermissions()
     @RequestMapping("/index")
@@ -34,6 +41,16 @@ public class GphyController extends BaseController {
     public String edit() {
         return "kmes/gphy/edit";
     }
-
+    
+    
+    @RequestMapping(value = "/zpwl", method = RequestMethod.POST)
+    @ResponseBody
+    public Object query(@RequestBody GphyCondition condition) {
+    	Integer code = gphyService.zpwl(condition);
+    	if(code!=null&&code>0) {
+    		return buildReturnData(code);
+    	}
+    	return ThreadContext.getReturnData();
+    }
 
 }

gavel/src/main/java/com/gavel/kwell/dao/GpfkDao.java

@@ -115,5 +115,10 @@ public interface GpfkDao extends BaseDao {
    
    public List<WobomVO> queryWobomByWo(String snid);
    
+   public GylxVO queryKwellWoStandGylx(String djid,String bzlx);
+   
+   public Gpfk queryKwellGpfkByWosnAndGxid(GpfkCondition condition);
+   
+   public double queryWobomZpslByDjidAndWlid(String djid,String wlid);
    
 }

gavel/src/main/java/com/gavel/kwell/dao/GphyDao.java

 package com.gavel.kwell.dao;
 
+import java.util.List;
+
 import com.gavel.common.base.dao.BaseDao;
 import com.gavel.kwell.vo.GphyCondition;
 import com.gavel.kwell.vo.GphyVO;
 import com.gavel.kwell.vo.GphycxVO;
+import com.gavel.kwell.vo.WlslItem;
 import com.gavel.persistence.sql.RecordSet;
 
 
@@ -16,5 +19,8 @@ public interface GphyDao extends BaseDao {
    public RecordSet<GphycxVO> queryGphy(GphyCondition condition);
 
    public RecordSet<GphycxVO> queryGphyMx(GphyCondition condition);
-
+   
+   public RecordSet<GphyVO> queryKwellZpGphy(GphyCondition condition);
+   
+   public List<WlslItem> queryKwellZpslGphy(GphyCondition condition);
 }

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

@@ -1232,7 +1232,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 
 
 	@Override
-	public List<WobomVO> queryWobomByWo(String snid) {
+	public List<WobomVO> queryWobomByWo(String djid) {
 		 SqlMap sqlMap = new SqlMap();
 	     sqlMap.append("select WOBOM_ID, WOBOM_XH, WOBOM_WOID, WOBOM_WLID, WOBOM_FFGX,");
 	     sqlMap.append("  WOBOM_DWYL, WOBOM_XQSL, WOBOM_XQRQ, WOBOM_SHL, WOBOM_SHZ, WOBOM_FFYZ,");
@@ -1245,12 +1245,110 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	     sqlMap.append("  left join WO on WO_ID = WOBOM_WOID");
 	     sqlMap.append("  left join WOGYLX on WOGYLX_ID = WOBOM_FFGX ");
 	     sqlMap.append("where 1=1");
-	     if (StringUtils.isNotEmpty(snid)){
-	          sqlMap.append("  and " + SqlUtil.getWhereSql("WO_DJID", snid));
-	          sqlMap.setParamValue("WO_DJID", snid);
+	     if (StringUtils.isNotEmpty(djid)){
+	          sqlMap.append("  and " + SqlUtil.getWhereSql("WO_DJID", djid));
+	          sqlMap.setParamValue("WO_DJID", djid);
 	      }
 	      sqlMap.append("order by WOBOM_XH, WLXX_CODE");
 	      return sqlMap.query(WobomVO.class);
 	}
+
+
+	@Override
+	public GylxVO queryKwellWoStandGylx(String woid,String bzlx) {
+		SqlMap sqlMap = new SqlMap();
+		 sqlMap.append("select GYLX_ID, GYLX_WLID, GYLX_XH, GYLX_NAME, GYLX_GXLX, ");
+	     sqlMap.append("  GYLX_GCID, GYLX_GZZXID, GYLX_BZGXID, GYLX_SBSL, GYLX_ZYRSL, ");
+	     sqlMap.append("  GYLX_PDHS, GYLX_ZBHS, GYLX_JGHS, GYLX_ZYHS, GYLX_GJGX, ");
+	     sqlMap.append("  GYLX_DWSJCL, GYLX_PCBS, GYLX_TYBZ, GYLX_TYRQ, GYLX_BZ,");
+	     sqlMap.append("  GYLX_CJRID, GYLX_CJR, GYLX_CJSJ, GYLX_WHRID, GYLX_WHR, ");
+	     sqlMap.append("  GYLX_WHSJ, GYLX_SYSVERSION,");
+	     sqlMap.append("  GYLX_GXBZ,GYLX_ATTACHCOUNT ");
+	     sqlMap.append("from GYLX ");
+	     sqlMap.append("  left join WOGYLX on GYLX_ID = WOGYLX_GYLXID ");
+	     sqlMap.append("where 1=1");
+	     if (StringUtils.isNotEmpty(woid)){
+	          sqlMap.append("  and " + SqlUtil.getWhereSql("WOGYLX_WOID", woid));
+	          sqlMap.setParamValue("WOGYLX_WOID", woid);
+	      }
+	     if (StringUtils.isNotEmpty(woid)){
+	          sqlMap.append("  and " + SqlUtil.getWhereSql("GYLX_BZGXID", bzlx));
+	          sqlMap.setParamValue("GYLX_BZGXID", bzlx);
+	      }
+	      return sqlMap.queryEntity(GylxVO.class);
+	}
+	
+	@Override
+	public Gpfk queryKwellGpfkByWosnAndGxid(GpfkCondition condition){
+			SqlMap sqlMap = new SqlMap();
+	        sqlMap.append("select GPFK_ID, GPFK_WOSNID, GPFK_FKLX, GPFK_FKSJ, GPFK_HGBZ, GPFK_FKSL, ");
+	        sqlMap.append("  GPFK_HGSL, GPFK_BHGSL, GPFK_FKR, GPFK_FKGX, GPFK_BZ, ");
+	        sqlMap.append("  GPFK_WHRID, GPFK_WHR, GPFK_WHSJ, GPFK_CJRID, GPFK_CJR, ");
+	        sqlMap.append("  GPFK_CJSJ, GPFK_SYSVERSION, GPFK_FKRID, GPFK_FKBX, GPFK_FKJSSJ, ");
+	        sqlMap.append("  BX_CODE, BX_NAME, BZGX_CODE, BZGX_NAME,  ");
+	        sqlMap.append("  WLXX_CODE, WLXX_NAME, WLXX_GG,  WO_DJID, ");
+	        sqlMap.append("  DATEDIFF(mi,GPFK_FKSJ,GPFK_FKJSSJ) as gxhs, ");
+	        sqlMap.append("  1GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_YWRQ, GPFK_HGDJ, WOSN_KHCODE");
+	        sqlMap.append("from GPFK ");
+	        sqlMap.append("  left join BX on BX_ID = GPFK_FKBX ");
+	        sqlMap.append("  left join WOSN on WOSN_CODE = GPFK_WOSNID ");
+	        sqlMap.append("  left join WO on WO_ID = WOSN_WOID ");
+	        sqlMap.append("  left join WLXX on WLXX_ID = WO_WLID  ");
+	        sqlMap.append("  left join BZGX on BZGX_ID = GPFK_FKGX ");
+	        sqlMap.append("where 1 = 1 ");
+	        if (StringUtils.isNotEmpty(condition.getId())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFK_ID", condition.getId()));
+	            sqlMap.setParamValue("GPFK_ID", condition.getId());
+	        }
+	        if (StringUtils.isNotEmpty(condition.getGxid())){
+	            sqlMap.append("  and GPFK_FKGX = :pFKGX ");
+	            sqlMap.setParamValue("pFKGX",condition.getGxid());
+	        }
+	        if (StringUtils.isNotEmpty(condition.getFkrid())){
+	            sqlMap.append("  and GPFK_FKRID = :pFKRID ");
+	            sqlMap.setParamValue("pFKRID",condition.getFkrid());
+	        }
+	        if (StringUtils.isNotEmpty(condition.getWosnid())){
+	            sqlMap.append("and GPFK_WOSNID like :pWOSNID ");
+	            sqlMap.setParamValueLike("pWOSNID", condition.getWosnid());
+	        }
+	        if (StringUtils.isNotEmpty(condition.getWodjid())){
+	            sqlMap.append("and WO_DJID like :pDJID ");
+	            sqlMap.setParamValueLike("pDJID", condition.getWodjid());
+	        }
+	        if (condition.getStart() != null) {
+	            sqlMap.append("  and GPFK_FKSJ >= :pFKSJS ");
+	            sqlMap.setParamValue("pFKSJS", condition.getStart());
+	        }
+	        if (condition.getEnd() != null) {
+	            sqlMap.append("  and GPFK_FKSJ <= :pFKSJE ");
+	            sqlMap.setParamValue("pFKSJE", condition.getEnd());
+	        }
+	        sqlMap.append("order by GPFK_FKSJ desc, GPFK_FKGX ");
+	        return sqlMap.queryEntity(Gpfk.class);
+	}
+
+
+	@Override
+	public double queryWobomZpslByDjidAndWlid(String djid,String wlid) {
+		 SqlMap sqlMap = new SqlMap();
+	     sqlMap.append("select sum(WOBOM_XQSL) ");
+	     sqlMap.append("from WOBOM");
+	     sqlMap.append("  left join WLXX on WLXX_ID = WOBOM_WLID");
+	     sqlMap.append("  left join WO on WO_ID = WOBOM_WOID");
+	     sqlMap.append("  left join WOGYLX on WOGYLX_ID = WOBOM_FFGX ");
+	     sqlMap.append("where 1=1");
+	     if (StringUtils.isNotEmpty(djid)){
+	          sqlMap.append("  and " + SqlUtil.getWhereSql("WO_DJID", djid));
+	          sqlMap.setParamValue("WO_DJID", djid);
+	      }
+	     if (StringUtils.isNotEmpty(wlid)){
+	          sqlMap.append("  and " + SqlUtil.getWhereSql("WOBOM_WLID", wlid));
+	          sqlMap.setParamValue("WOBOM_WLID", wlid);
+	      }
+	      return sqlMap.queryDouble();
+	}
+
+
 }
 

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

@@ -6,9 +6,13 @@ import com.gavel.kwell.dao.GphyDao;
 import com.gavel.kwell.vo.GphyCondition;
 import com.gavel.kwell.vo.GphyVO;
 import com.gavel.kwell.vo.GphycxVO;
+import com.gavel.kwell.vo.WlslItem;
 import com.gavel.persistence.sql.RecordSet;
 import com.gavel.persistence.sql.SqlMap;
 import com.gavel.persistence.sql.SqlUtil;
+
+import java.util.List;
+
 import org.springframework.stereotype.Repository;
 
 
@@ -100,4 +104,48 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao {
                 return sqlMap.getRecordSet();
         }
 
+		@Override
+		public RecordSet<GphyVO> queryKwellZpGphy(GphyCondition condition) {
+			SqlMap sqlMap = new SqlMap();
+	        sqlMap.append("select GPHY_ID, GPHY_MID, GPHY_WLSNID, GPHY_FKSJ, GPHY_ZPSL, ");
+	        sqlMap.append("   GPHY_CXSL, GPHY_FKR, GPHY_FKGX, GPHY_BZ, GPHY_WHRID, ");
+	        sqlMap.append("   GPHY_WHR, GPHY_WHSJ, GPHY_CJRID, GPHY_CJR, GPHY_CJSJ, ");
+	        sqlMap.append("   GPHY_SYSVERSION, GPHY_WLID, GPHY_HYLX, GPHY_FKRID ");
+	        sqlMap.append("from GPHY ");
+	        sqlMap.append("where 1 = 1 ");
+	        if (StringUtils.isNotEmpty(condition.getId())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPHY_ID", condition.getId()));
+	            sqlMap.setParamValue("GPHY_ID", condition.getId());
+	        }
+	        if (StringUtils.isNotEmpty(condition.getSnid())){
+	        	sqlMap.append("  and (GPHY_WLSNID  like :pSnid or  WLXX_CODE like :pSnid or WLXX_NAME like :pSnid) ");
+                sqlMap.setParamValueLike("pSnid", condition.getSnid());
+	        }
+	        if (StringUtils.isNotEmpty(condition.getMid())){
+	        	sqlMap.append("  and " + SqlUtil.getWhereSql("GPHY_MID", condition.getMid()));
+	            sqlMap.setParamValue("GPHY_MID", condition.getMid());
+	        }
+	        sqlMap.query(GphyVO.class);
+	        return sqlMap.getRecordSet();
+		}
+
+		@Override
+		public List<WlslItem> queryKwellZpslGphy(GphyCondition condition) {
+			SqlMap sqlMap = new SqlMap();
+	        sqlMap.append("select sum(GPHY_ZPSL) as zpsl, GPHY_WLID  as wlid ");
+	        sqlMap.append("from GPHY ");
+	        sqlMap.append("where 1 = 1 ");
+	        sqlMap.append("group by GPHY_WLID");
+	        if (StringUtils.isNotEmpty(condition.getMid())){
+	        	sqlMap.append("  and " + SqlUtil.getWhereSql("GPHY_MID", condition.getMid()));
+	            sqlMap.setParamValue("GPHY_MID", condition.getMid());
+	        }
+	        if (StringUtils.isNotEmpty(condition.getWlid())){
+	        	sqlMap.append("  and " + SqlUtil.getWhereSql("GPHY_WLID", condition.getWlid()));
+	            sqlMap.setParamValue("GPHY_WLID", condition.getWlid());
+	        }
+	        return sqlMap.query(WlslItem.class);
+		}
+        
+
 }

gavel/src/main/java/com/gavel/kwell/service/GpfkService.java

@@ -4,9 +4,10 @@ import java.util.Date;
 import java.util.List;
 
 import com.gavel.common.base.service.BaseEditService;
-import com.gavel.gygl.persistent.Gylx;
+import com.gavel.file.vo.FilesVO;
 import com.gavel.gygl.vo.BzgxCondition;
 import com.gavel.gygl.vo.BzgxVO;
+import com.gavel.gygl.vo.GylxVO;
 import com.gavel.kwell.persistent.Gpfk;
 import com.gavel.kwell.utils.SmCodeModel;
 import com.gavel.kwell.vo.GpResVO;
@@ -93,7 +94,17 @@ public interface GpfkService extends BaseEditService {
   
   public List<WobomVO> queryWobomByWo(String snid);
   
-  public Gylx queryKwellWoStandGylx(String djid);
+  public GylxVO queryKwellWoStandGylx(String djid,String bzlx);
+  
+  public FilesVO queryWoGylxFj(String djid,String bzlx);
+  
+  public Gpfk queryKwellWosnWithAddGpfk(String wosn,String bzlx);
+  
+  public void jyfk(String fkid,String hgsn);
+  
+  public void wxfk(String fkid,String hgsn);
+  
+  public BzgxVO login(String usersn,String bzgxid);
 	
   /** 科威尔mes工票反馈重写--end    */
 }

gavel/src/main/java/com/gavel/kwell/service/GphyService.java

 package com.gavel.kwell.service;
 
+import java.util.List;
+
 import com.gavel.common.base.service.BaseEditService;
 import com.gavel.kwell.vo.GphyCondition;
 import com.gavel.kwell.vo.GphyVO;
 import com.gavel.kwell.vo.GphycxVO;
+import com.gavel.kwell.vo.WlslItem;
 import com.gavel.persistence.sql.RecordSet;
 
 
@@ -17,5 +20,13 @@ public interface GphyService extends BaseEditService {
   public RecordSet<GphycxVO> queryGphy(GphyCondition condition);
 
   public RecordSet<GphycxVO> queryGphyMx(GphyCondition condition);
+  
+  public void queryGphyWithOrGphy(GphyCondition condition);
+  
+  public Integer zpwl(GphyCondition condition);
+  
+  public Integer compareIsZpComplete(String djid);
+  
+  public List<WlslItem> querywlzpsl(GphyCondition condition);
 
 }

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

@@ -3,13 +3,18 @@ package com.gavel.kwell.service.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.UsernamePasswordToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.gavel.common.Constants;
 import com.gavel.common.base.entity.BaseEntity;
 import com.gavel.common.base.service.impl.BaseEditServiceImpl;
 import com.gavel.common.business.service.CommonService;
@@ -17,15 +22,20 @@ import com.gavel.common.sql.GavelSql;
 import com.gavel.common.utils.BooleanEnum;
 import com.gavel.common.utils.CodeStrategy;
 import com.gavel.common.utils.DateUtils;
+import com.gavel.common.utils.MapList;
 import com.gavel.common.utils.NumberUtils;
 import com.gavel.common.utils.StringUtils;
 import com.gavel.common.utils.ThreadContext;
 import com.gavel.common.utils.UserInfoUtil;
+import com.gavel.file.service.FilesService;
+import com.gavel.file.vo.FilesVO;
+import com.gavel.framework.utils.JwtUtil;
 import com.gavel.gygl.persistent.Bzgx;
-import com.gavel.gygl.persistent.Gylx;
+import com.gavel.gygl.service.BzgxService;
 import com.gavel.gygl.utils.GyglParamEnum;
 import com.gavel.gygl.vo.BzgxCondition;
 import com.gavel.gygl.vo.BzgxVO;
+import com.gavel.gygl.vo.GylxVO;
 import com.gavel.kwell.dao.GpfkDao;
 import com.gavel.kwell.persistent.Gpbhgmx;
 import com.gavel.kwell.persistent.Gpfk;
@@ -44,6 +54,11 @@ import com.gavel.kwell.vo.GpbhgmxVO;
 import com.gavel.kwell.vo.GpfkCondition;
 import com.gavel.kwell.vo.GpfkVO;
 import com.gavel.kwell.vo.HzWoVO;
+import com.gavel.kzzx.dao.UserDao;
+import com.gavel.kzzx.persistent.User;
+import com.gavel.kzzx.service.UserRoleService;
+import com.gavel.kzzx.vo.UserRoleCondition;
+import com.gavel.kzzx.vo.UserRoleVO;
 import com.gavel.persistence.sql.RecordSet;
 import com.gavel.wo.vo.WobomVO;
 
@@ -57,6 +72,18 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 
     @Autowired
     private CommonService commonService;
+    
+    @Autowired
+    private BzgxService bzgxService;
+    
+    @Autowired
+    private FilesService filesService;
+    
+    @Autowired
+    private UserRoleService userRoleService;
+    
+    @Autowired
+    private UserDao userDao;
 
     @Override
     public void initService() {
@@ -792,9 +819,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	}
 
 	@Override
-	public Gylx queryKwellWoStandGylx(String djid) {
-		
-		return null;
+	public GylxVO queryKwellWoStandGylx(String woid,String bzlx) {
+		return gpfkDao.queryKwellWoStandGylx(woid, bzlx);
 	}
 
 	@Override
@@ -815,4 +841,130 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		return gpfkDao.queryWobomByWo(snid);
 	}
 
+	@Override
+	public FilesVO queryWoGylxFj(String woid,String bzlx) {
+		GylxVO gylx = queryKwellWoStandGylx(woid, bzlx);
+		if(gylx!=null) {
+			List<FilesVO> list = filesService.queryFileAndSubFolder(gylx.getId());
+			if(list!=null&&list.size()>0) {
+				return list.get(0);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	@Transactional
+	public Gpfk queryKwellWosnWithAddGpfk(String wosn, String bzlx) {
+		GpfkCondition gpfkCondition = new GpfkCondition();
+		gpfkCondition.setWosnid(wosn);
+		gpfkCondition.setGxid(bzlx);
+		Gpfk gpfk = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
+		if(gpfk==null) {
+			HzWoVO hzWoVO =queryKwellWoBySnid(wosn);
+			gpfk = new Gpfk();
+			gpfk.setWosnid(wosn);
+			gpfk.setFkgx(bzlx);
+			gpfk.setFkrid(UserInfoUtil.getId());
+			gpfk.setFkr(UserInfoUtil.getUserName());
+			gpfk.setFksj(DateUtils.getDate());
+			gpfk.setWlid(hzWoVO.getWlid());
+			insert(gpfk);
+			gpfk = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
+		}
+		return gpfk;
+	}
+
+	@Override
+	public void jyfk(String fkid, String hgsn) {
+		GpfkCondition gpfkCondition = new GpfkCondition();
+		gpfkCondition.setId(fkid);
+		Gpfk gpfk = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
+		if(SmCodeEnum.OKBZ.getId().equals(hgsn)) {
+			gpfk.setHgsl(gpfk.getHgsl()+1.0);
+		}
+		else if(SmCodeEnum.NGBZ.getId().equals(hgsn)) {
+			gpfk.setBhgsl(gpfk.getBhgsl()+1.0);
+		}
+		else {
+			throwReturnMessage(SmCodeEnum.ERROR_CODE); 
+		}
+		update(gpfk);
+	}
+	
+	@Override
+	public void wxfk(String fkid, String hgsn) {
+		GpfkCondition gpfkCondition = new GpfkCondition();
+		gpfkCondition.setId(fkid);
+		Gpfk gpfk = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
+		if(SmCodeEnum.OKBZ.getId().equals(hgsn)) {
+			gpfk.setHgsl(1.0);
+			gpfk.setBhgsl(0.0);
+		}
+		else if(SmCodeEnum.NGBZ.getId().equals(hgsn)) {
+			gpfk.setHgsl(0.0);
+			gpfk.setBhgsl(1.0);
+		}
+		else {
+			throwReturnMessage(SmCodeEnum.ERROR_CODE); 
+		}
+		update(gpfk);
+	}
+
+	@Override
+	public BzgxVO login(String usersn, String bzgxid) {
+        BzgxCondition condition = new BzgxCondition();
+        condition.setId(bzgxid);
+        List<BzgxVO> bzgxVOs= bzgxService.query(condition).getRecords();
+		if(bzgxVOs==null||bzgxVOs.size()!=1) {
+        	throwReturnMessage("标准工序序列号异常");
+        }
+		User user =userDao.queryForLogin(usersn);
+		if (user == null) {
+            throwReturnMessage("用户不存在！");
+        }
+        if (StringUtils.equalsIgnoreCase(user.getTybz(), "Y")) {
+        	throwReturnMessage("用户禁用！");
+        }
+        if(!BooleanEnum.equalsYes(user.getLogin())){
+        	throwReturnMessage("用户非登录用户！");
+        }
+       //设置session数据
+        MapList userInfo = new MapList();
+        userInfo.put(Constants.UserInfo.ID, user.getId());
+        userInfo.put(Constants.UserInfo.USERID, user.getUserid());
+        userInfo.put(Constants.UserInfo.USERNAME, user.getUsername());
+        userInfo.put(Constants.UserInfo.SUPERUSER, user.getSuperuser());
+        userInfo.put(Constants.UserInfo.ORGNAME, StringUtils.isNotEmpty(user.getBmid())?user.getBmid():"");
+        userInfo.put(Constants.UserInfo.LOGINTIME, new Date());
+        userInfo.put("newlogin", true);
+        String token = JwtUtil.generateToken(user.getUserid());
+        userInfo.put(Constants.UserInfo.TOKEN, token);
+        UserRoleCondition userRoleCondition = new UserRoleCondition();
+        userRoleCondition.setUserid(user.getUserid());
+        RecordSet<UserRoleVO> userRoleVORecords = userRoleService.queryRoleByUser(userRoleCondition);
+        Set<String> roles = new LinkedHashSet<>();
+        if (userRoleVORecords != null && userRoleVORecords.getRecords() != null) {
+            for (UserRoleVO userRoleVO : userRoleVORecords.getRecords()) {
+                roles.add(userRoleVO.getRoleid());
+            }
+        }
+        UserInfoUtil.setRoles(roles);
+        userInfo.put("roles",roles);
+        UserInfoUtil.setUserInfo(token,userInfo);
+        addReturnData("userkey", user.getId());
+        addReturnData("userid", user.getUserid());
+        addReturnData("username", user.getUsername());
+        addReturnData("orgname", user.getBmid());
+        addReturnData("email", user.getEmail());
+        addReturnData("superuser", user.getSuperuser());
+        addReturnData("appName", commonService.getApplicationName());
+        addReturnData(Constants.UserInfo.TOKEN, token);
+        addReturnData("roles", roles);
+        UserInfoUtil.tokenUserMap.put(token, userInfo);
+        UsernamePasswordToken usernamePasswordToken = new UsernamePasswordToken(StringUtils.upperCase(user.getUserid()), user.getPassword());
+        SecurityUtils.getSubject().login(usernamePasswordToken);
+        return bzgxVOs.get(0);
+	}
+
 }

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

 package com.gavel.kwell.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.gavel.common.base.service.impl.BaseEditServiceImpl;
+import com.gavel.jcsj.service.CoderuleService;
+import com.gavel.kwell.dao.GpfkDao;
 import com.gavel.kwell.dao.GphyDao;
 import com.gavel.kwell.persistent.Gphy;
 import com.gavel.kwell.service.GphyService;
 import com.gavel.kwell.vo.GphyCondition;
 import com.gavel.kwell.vo.GphyVO;
 import com.gavel.kwell.vo.GphycxVO;
+import com.gavel.kwell.vo.WlslItem;
 import com.gavel.persistence.sql.RecordSet;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 
 @Service("gphyService")
 @Transactional
 public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService {
 
+	private static final Integer COMPLETE_CODE =230;
+	private static final Integer ZP_CODE =200;
+	private static final Integer SAME_CODE =100;
+	
     @Autowired
     private GphyDao gphyDao;
+    
+    @Autowired
+    private GpfkDao gpfkDao;
+    
+    @Autowired
+    private CoderuleService coderuleService;
 
     @Override
     public void initService() {
@@ -46,7 +60,49 @@ public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService
         return gphyDao.queryGphyMx(condition);
     }
 
+	@Override
+	public void queryGphyWithOrGphy(GphyCondition condition) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	@Override
+	public Integer zpwl(GphyCondition condition) {
+		List<GphyVO> gphyVO =gphyDao.queryKwellZpGphy(condition).getRecords();
+		if(gphyVO!=null&&gphyVO.size()>0) {
+			return SAME_CODE;
+		}
+		String wlid = coderuleService.matchCodeByRule(condition.getSnid());
+		Gphy gphy = new Gphy();
+		gphy.setFkgx(condition.getGxid());
+		gphy.setWlid(wlid);
+		gphy.setMid(condition.getMid());
+		gphy.setWlsnid(condition.getSnid());
+		gphy.setZpsl(1.0);
+		insert(gphy);
+		return compareIsZpComplete(condition.getMid());
+	}
 
+	@Override
+	public Integer compareIsZpComplete(String woid) {
+		GphyCondition condition =new GphyCondition();
+		condition.setMid(woid);
+		List<WlslItem> wlslItem =querywlzpsl(condition);
+		if(wlslItem!=null&&wlslItem.size()>0) {
+			for(int i=0;i<wlslItem.size();i++) {
+				double xqsl =gpfkDao.queryWobomZpslByDjidAndWlid(woid, wlslItem.get(i).getWlid());
+				if(xqsl!=wlslItem.get(i).getZpsl()) {
+					return ZP_CODE;
+				}
+			}
+			return COMPLETE_CODE;
+		}
+		return ZP_CODE;
+	}
 
+	@Override
+	public List<WlslItem> querywlzpsl(GphyCondition condition) {
+		return gphyDao.queryKwellZpslGphy(condition);
+	}
 }
 

gavel/src/main/java/com/gavel/kwell/utils/SmCodeEnum.java

@@ -3,10 +3,8 @@ package com.gavel.kwell.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gavel.common.module.ModuleParams;
-import com.gavel.jcsj.utils.SnGzflEnum;
-
 public enum SmCodeEnum {
+	
 
 	LOGOUT("LOGOUT", "退出","LOGOUT",10),
 	WOSNID("WOSNID","工单序列号","20",10),
@@ -18,6 +16,8 @@ public enum SmCodeEnum {
 	private String name;
 	private String prefix;
 	private Integer len;
+	
+	public static final String ERROR_CODE ="序列号错误";
 
 	SmCodeEnum(String id, String name,String prefix,Integer len){
 		this.id = id;

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

@@ -97,7 +97,7 @@
 		/* 扫描物料 */
 		function zpfk_wlxh(z){
 			let that =z
-			gas.post('kmes/gphy/zpwl  ',{"wlxh":that.xlh}, function(res){
+			gas.post('kmes/gphy/zpwl  ',{"wlxh":that.xlh,"djid":that.gd}, function(res){
 				if(res.data&&res.data.records){
 				/* 表格加1 ok标志改变 日志 */
 				

gavel/src/main/resources/templates/views/login_view.html

@@ -128,6 +128,15 @@
 		let bzgxsn=$gylx.val()
 		HTTP.post("kmes/gpfk/login ", {usersn:usersn,bzgxsn:bzgxsn}, function(result) {
 			if (result['success']) {
+				if(result.data.records.gylx=='ZP'){
+					
+				}
+				else if(result.data.records.gylx=='JY'){
+					
+				}
+				else if(result.data.records.gylx=='WX'){
+					
+				}
 			} else {
 				$rygh.val("")
 				$gylx.val("")