整合代码修改BUG

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

@@ -28,9 +28,10 @@ import com.gavel.common.utils.DateUtils;
 import com.gavel.common.utils.StringUtils;
 import com.gavel.common.utils.ThreadContext;
 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.FkCondition;
+import com.gavel.kwell.vo.FkVO;
 import com.gavel.kwell.vo.GpResVO;
 import com.gavel.kwell.vo.GpbhgfkCondition;
 import com.gavel.kwell.vo.GpbhgmxVO;
@@ -266,24 +267,6 @@ public class GpfkController extends BaseController {
         }
     }
     
-    @ApiOperation(value = "扫描生产主产品条码，{\"wosnid\":111}传入条码，返回任务单信息")
-    @RequestMapping(value = "/queryKwellWoinfo", method = RequestMethod.POST)
-    @ResponseBody
-    public Object getKwellSninfo(@RequestBody JSONObject param) {
-        String wosnid = param.getString("wosnid");
-        String bzlx = param.getString("bzlx");
-        if(StringUtils.isEmpty(wosnid)){
-            setReturnMessage("条码不允许为空！");
-            return returnData();
-        }
-        GpfkVO gpfk = gpfkService.queryKwellWosnWithAddGpfk(wosnid, bzlx);
-        if(gpfk != null){
-            return buildReturnData(gpfk);
-        }else{
-            return ThreadContext.getReturnData();
-        }
-    }
-    
     @ApiOperation(value = "扫码得到wobom，{\"woid\":111}传入条码，返回任务单信息")
     @RequestMapping(value = "/queryWoBomByWoid", method = RequestMethod.POST)
     @ResponseBody
@@ -313,18 +296,22 @@ public class GpfkController extends BaseController {
     	}
     	
     }
-    
+    @RequestMapping(value = "/zpwl", method = RequestMethod.POST)
+    @ResponseBody
+    public Object query(@RequestBody JSONObject param) {
+    	FkCondition condition = JSONObject.toJavaObject(param, FkCondition.class);
+    	FkVO gpfk  = gpfkService.zpfk(condition);
+    	if(gpfk!=null) {
+    		return buildReturnData(gpfk);
+    	}
+    	return ThreadContext.getReturnData();
+    }
     
     @RequestMapping(value = "/jyfk", method = RequestMethod.POST)
     @ResponseBody
     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();
-        }
-        Gpfk gpfk =gpfkService.jyfk(fkid, hgsn);
+    	FkCondition condition = JSONObject.toJavaObject(param, FkCondition.class);
+    	FkVO gpfk =gpfkService.jyfk(condition);
         if(gpfk != null){
             return buildReturnData(gpfk);
         }else{
@@ -335,13 +322,8 @@ public class GpfkController extends BaseController {
     @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();
-        }
-        Gpfk gpfk =gpfkService.wxfk(fkid, hgsn);
+    	FkCondition condition = JSONObject.toJavaObject(param, FkCondition.class);
+    	FkVO gpfk =gpfkService.wxfk(condition);
         if(gpfk != null){
             return buildReturnData(gpfk);
         }else{

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

 package com.gavel.kwell.controller;
 
-import com.gavel.common.BaseURL;
-import com.gavel.common.base.BaseEditJSON;
-import com.gavel.common.converter.DataConvert;
-import com.gavel.common.utils.StringUtils;
-import com.gavel.kwell.persistent.Gpfk;
-import com.gavel.kwell.service.GpfkService;
-import com.gavel.kwell.vo.GpfkCondition;
-import com.gavel.kwell.vo.GpfkVO;
-import com.gavel.persistence.sql.RecordSet;
-import io.swagger.annotations.ApiOperation;
+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.RequestBody;
@@ -18,15 +11,19 @@ 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;
 import com.gavel.common.annotation.ResourcePermissions;
+import com.gavel.common.base.BaseEditJSON;
 import com.gavel.common.base.controller.BaseController;
+import com.gavel.common.converter.DataConvert;
+import com.gavel.common.utils.StringUtils;
 import com.gavel.common.utils.ThreadContext;
+import com.gavel.kwell.service.GpfkService;
 import com.gavel.kwell.service.GphyService;
-import com.gavel.kwell.vo.GphyCondition;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.gavel.kwell.vo.GpfkCondition;
+import com.gavel.kwell.vo.GpfkVO;
+import com.gavel.persistence.sql.RecordSet;
 
 
 @Controller
@@ -70,18 +67,6 @@ public class GphyController extends BaseController {
     }
     
 
-    @RequestMapping(value = "/zpwl", method = RequestMethod.POST)
-    @ResponseBody
-    public Object query(@RequestBody JSONObject param) {
-    	GphyCondition condition = JSONObject.toJavaObject(param, GphyCondition.class);
-    	Gpfk gpfk  = gphyService.zpwl(condition);
-    	if(gpfk!=null) {
-    		return buildReturnData(gpfk);
-    	}
-    	return ThreadContext.getReturnData();
-    }
-
-
     @RequestMapping(value = BaseURL.QUERY, method = RequestMethod.POST)
     @ResponseBody
     public Object query(@RequestBody GpfkCondition condition) {

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

@@ -12,10 +12,13 @@ import com.gavel.kwell.persistent.Gpbhgmx;
 import com.gavel.kwell.persistent.Gpfk;
 import com.gavel.kwell.persistent.Gphy;
 import com.gavel.kwell.persistent.Gpwxmx;
+import com.gavel.kwell.vo.FkCondition;
+import com.gavel.kwell.vo.FkVO;
 import com.gavel.kwell.vo.GpWoCondition;
 import com.gavel.kwell.vo.GpbhgmxVO;
 import com.gavel.kwell.vo.GpfkCondition;
 import com.gavel.kwell.vo.GpfkVO;
+import com.gavel.kwell.vo.GphyCondition;
 import com.gavel.kwell.vo.GpwxmxVO;
 import com.gavel.kwell.vo.WolinkInfoVO;
 import com.gavel.kwell.vo.WosngzVO;
@@ -114,13 +117,13 @@ public interface GpfkDao extends BaseDao {
    /**科威尔工票反馈sql */
    public WosngzVO queryKwellWoBySnid(String snid);
    
-   public WolinkInfoVO queryKwellWoBySnid(String snid,String bzgx);
+   public FkVO queryKwellWoBySnid(String snid,String bzgx);
    
    public List<WobomVO> queryWobomByWo(String woid,String bzgx,String wosn);
    
    public GylxVO queryKwellWoStandGylx(String djid,String bzgx);
    
-   public GpfkVO queryKwellGpfkByWosnAndGxid(GpfkCondition condition);
+   public GpfkVO queryKwellGpfkByWosnAndGxid(FkCondition condition);
    
    public double queryWobomZpslByDjidAndWlid(String fkid,String wlid);
    
@@ -132,4 +135,9 @@ public interface GpfkDao extends BaseDao {
    
    public List<WobomVO> queryWobomByFkidAndWlid(String fkid,String wlid,String bzlx); 
    
+   public double checkIfContainsWosn(String sn);
+   
+   public double checkIfContainsWobomWl(FkCondition fkCondition);
+   public double checkIfContainsGphywl(GphyCondition condition);
+   
 }

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

@@ -4,7 +4,6 @@ package com.gavel.kwell.dao.impl;
 import java.util.Date;
 import java.util.List;
 
-import com.gavel.wo.persistent.Wogylx;
 import org.springframework.stereotype.Repository;
 
 import com.gavel.common.Constants;
@@ -21,16 +20,19 @@ import com.gavel.kwell.persistent.Gpfk;
 import com.gavel.kwell.persistent.Gphy;
 import com.gavel.kwell.persistent.Gpwxmx;
 import com.gavel.kwell.utils.GpfkFklxEnum;
+import com.gavel.kwell.vo.FkCondition;
+import com.gavel.kwell.vo.FkVO;
 import com.gavel.kwell.vo.GpWoCondition;
 import com.gavel.kwell.vo.GpbhgmxVO;
 import com.gavel.kwell.vo.GpfkCondition;
 import com.gavel.kwell.vo.GpfkVO;
+import com.gavel.kwell.vo.GphyCondition;
 import com.gavel.kwell.vo.GpwxmxVO;
-import com.gavel.kwell.vo.WolinkInfoVO;
 import com.gavel.kwell.vo.WosngzVO;
 import com.gavel.persistence.sql.RecordSet;
 import com.gavel.persistence.sql.SqlMap;
 import com.gavel.persistence.sql.SqlUtil;
+import com.gavel.wo.persistent.Wogylx;
 import com.gavel.wo.vo.WobomVO;
 import com.gavel.wo.vo.WogylxVO;
 
@@ -1149,7 +1151,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	}
 	
 	@Override
-	public GpfkVO queryKwellGpfkByWosnAndGxid(GpfkCondition condition){
+	public GpfkVO queryKwellGpfkByWosnAndGxid(FkCondition 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, ");
@@ -1166,41 +1168,17 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.append("  left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX ");
 	        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.getBzgxid())){
-	             sqlMap.append("  and BZGX_ID = :pBZGX ");
-	             sqlMap.setParamValue("pBZGX",condition.getBzgxid());
+	             sqlMap.append("  and GPFK_FKGX = :pFKGX ");
+	             sqlMap.setParamValue("pFKGX",condition.getBzgxid());
 	         }
 	         if (StringUtils.isNotEmpty(condition.getWogylx())){
 	             sqlMap.append("  and WOGYLX_ID = :pWOGYLX ");
 	             sqlMap.setParamValue("pWOGYLX",condition.getWogylx());
 	         }
-	        if (StringUtils.isNotEmpty(condition.getFkrid())){
-	            sqlMap.append("  and GPFK_FKRID = :pFKRID ");
-	            sqlMap.setParamValue("pFKRID",condition.getFkrid());
-	        }
-	        if (StringUtils.isNotEmpty(condition.getWosnid())){
+	        if (StringUtils.isNotEmpty(condition.getWosncode())){
 	            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.setParamValueLike("pWOSNID", condition.getWosncode());
 	        }
 	        sqlMap.append("order by GPFK_FKSJ desc, GPFK_FKGX ");
 	        return sqlMap.queryEntity(GpfkVO.class);
@@ -1230,9 +1208,10 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 
 
 	@Override
-	public WolinkInfoVO queryKwellWoBySnid(String snid, String bzgx) {
+	public FkVO queryKwellWoBySnid(String snid, String bzgx) {
 		 	SqlMap sqlMap = new SqlMap();
-	        sqlMap.append("select WO_ID,WO_ZT, WLXX_ID,WOSN_CODE,WOSN_ID,BZGX_ID,WOGYLX_ID ");
+	        sqlMap.append("select WO_ID,BZGX_CODE,WO_ZT,WLXX_CODE,WLXX_GG,WLXX_ID,WOSN_CODE,WOSN_ID,BZGX_ID,WOGYLX_ID,");
+	        sqlMap.append(" BZGX_NAME,WLXX_GG,WO_DJID,BZGX_GXLX,WOSN_CODE ");
 	        sqlMap.append("from WOSN ");
 	        sqlMap.append("  left join  WO on WO_ID=WOSN_WOID");
 	        sqlMap.append("  left join WOGYLX on WOGYLX_WOID =WO_ID");
@@ -1244,7 +1223,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.setParamValue("pSNID",snid);
 	        sqlMap.append("  and  BZGX_ID = :pBZGXID ");
 	        sqlMap.setParamValue("pBZGXID",bzgx);
-	        return sqlMap.queryEntity(WolinkInfoVO.class);
+	        return sqlMap.queryEntity(FkVO.class);
 	}
 
 
@@ -1343,5 +1322,61 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	}
 
 
+	@Override
+	public double checkIfContainsWosn(String sn) {
+		 SqlMap sqlMap = new SqlMap();
+	     sqlMap.append("select count(1) ");
+	     sqlMap.append("from WOSN");
+	     sqlMap.append("where 1=1");
+	     if (StringUtils.isNotEmpty(sn)){
+	            sqlMap.append("and WOSN_CODE like :pWOSNID ");
+	            sqlMap.setParamValueLike("pWOSNID", sn);
+	        }
+	      System.out.println(sqlMap.getSqlText());
+	      return sqlMap.queryDouble();
+	}
+
+
+	@Override
+	public double checkIfContainsWobomWl(FkCondition fkCondition) {
+		SqlMap sqlMap = new SqlMap();
+	     sqlMap.append("select count(1) ");
+	     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 WOSN on WOSN_WOID = WO_ID");
+	     sqlMap.append("where 1=1");
+	     if (StringUtils.isNotEmpty(fkCondition.getBzgxid())){
+	          sqlMap.append("  and " + SqlUtil.getWhereSql("WOBOM_FFGX", fkCondition.getBzgxid()));
+	          sqlMap.setParamValue("WOBOM_FFGX", fkCondition.getBzgxid());
+	      }
+	     if (StringUtils.isNotEmpty(fkCondition.getWosncode())){
+	          sqlMap.append("  and " + SqlUtil.getWhereSql("WOSN_CODE", fkCondition.getWosncode()));
+	          sqlMap.setParamValue("WOSN_CODE", fkCondition.getWosncode());
+	      }
+	     if (StringUtils.isNotEmpty(fkCondition.getWlxxId())){
+	          sqlMap.append("  and " + SqlUtil.getWhereSql("WLXX_ID", fkCondition.getWlxxId()));
+	          sqlMap.setParamValue("WLXX_ID", fkCondition.getWlxxId());
+	      }
+	      return sqlMap.queryDouble();
+	}
+
+	public double checkIfContainsGphywl(GphyCondition condition) {
+		SqlMap sqlMap = new SqlMap();
+        sqlMap.append("select count(1) ");
+        sqlMap.append("from GPHY ");
+        sqlMap.append("LEFT JOIN WLXX ON WLXX_ID = GPHY_WLID ");
+        sqlMap.append("where 1 = 1 ");
+        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());
+        }
+        return sqlMap.queryDouble();
+	}
+
 }
 

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

@@ -10,6 +10,8 @@ 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.FkCondition;
+import com.gavel.kwell.vo.FkVO;
 import com.gavel.kwell.vo.GpResVO;
 import com.gavel.kwell.vo.GpWoCondition;
 import com.gavel.kwell.vo.GpbhgfkCondition;
@@ -98,17 +100,23 @@ public interface GpfkService extends BaseEditService {
   
   public Attachment queryWoGylxFj(String djid,String bzlx);
   
-  public GpfkVO queryKwellWosnWithAddGpfk(String wosn,String bzlx);
-  
-  public Gpfk jyfk(String fkid,String hgsn);
-  
-  public Gpfk wxfk(String fkid,String hgsn);
-  
   public BzgxVO login(String usersn,String bzgxid);
   
   public void updatePcjh(String woid,String fklx,boolean hgbz);
   
   public void cancelPcjh(String woid,String fklx,boolean hgbz);
   
+  /**
+   	*  判断序列号类型
+   */
+  public String checkSnType(String snid);
+  
+  
+  public FkVO zpfk(FkCondition fkCondition);
+  public FkVO jyfk(FkCondition fkCondition);
+  public FkVO wxfk(FkCondition fkCondition);
+  
+  
+
     /** 科威尔mes工票反馈重写--end    */
 }

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

@@ -24,8 +24,6 @@ public interface GphyService extends BaseEditService {
   
   public void queryGphyWithOrGphy(GphyCondition condition);
   
-  public Gpfk zpwl(GphyCondition condition);
-  
   public boolean compareIsZpComplete(String fkid,String wlid);
   
   public WlslItem querywlzpsl(GphyCondition condition);

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

@@ -37,6 +37,7 @@ 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.jcsj.service.CoderuleService;
 import com.gavel.kwell.dao.GpfkDao;
 import com.gavel.kwell.dao.GphyDao;
 import com.gavel.kwell.persistent.Gpbhgmx;
@@ -50,6 +51,8 @@ import com.gavel.kwell.utils.HzGylxEnum;
 import com.gavel.kwell.utils.SmCodeEnum;
 import com.gavel.kwell.utils.SmCodeModel;
 import com.gavel.kwell.utils.YymkFKEnum;
+import com.gavel.kwell.vo.FkCondition;
+import com.gavel.kwell.vo.FkVO;
 import com.gavel.kwell.vo.GpResVO;
 import com.gavel.kwell.vo.GpWoCondition;
 import com.gavel.kwell.vo.GpbhgfkCondition;
@@ -57,7 +60,6 @@ import com.gavel.kwell.vo.GpbhgmxVO;
 import com.gavel.kwell.vo.GpfkCondition;
 import com.gavel.kwell.vo.GpfkVO;
 import com.gavel.kwell.vo.GphyCondition;
-import com.gavel.kwell.vo.WolinkInfoVO;
 import com.gavel.kwell.vo.WosngzVO;
 import com.gavel.kzzx.dao.UserDao;
 import com.gavel.kzzx.persistent.User;
@@ -73,11 +75,9 @@ import com.gavel.wo.persistent.Pcjhmx;
 import com.gavel.wo.persistent.Wogylx;
 import com.gavel.wo.persistent.Wosn;
 import com.gavel.wo.service.PcjhmxService;
-import com.gavel.wo.vo.PcjhCondition;
 import com.gavel.wo.vo.PcjhmxCondition;
 import com.gavel.wo.vo.PcjhmxVO;
 import com.gavel.wo.vo.WobomVO;
-import com.gavel.wo.vo.WogylxVO;
 
 
 @Service("gpfkService")
@@ -103,6 +103,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
     @Autowired
     private UserRoleService userRoleService;
     
+    @Autowired
+    private GphyService gphyService;
+    
     @Autowired
     private YymkService yymkService;
     
@@ -112,6 +115,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
     @Autowired
     private AttachmentService attachmentService;
     
+    @Autowired
+    private CoderuleService coderuleService;
+    
     @Autowired
     private UserDao userDao;
 
@@ -765,123 +771,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		return null;
 	}
 
-	@Override
-	@Transactional
-	public GpfkVO queryKwellWosnWithAddGpfk(String wosn, String bzlx) {
-		GpfkCondition gpfkCondition = new GpfkCondition();
-		gpfkCondition.setWosnid(wosn);
-		gpfkCondition.setBzgxid(bzlx);
-		GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
-		WolinkInfoVO wolinkInfoVO =gpfkDao.queryKwellWoBySnid(wosn, bzlx);
-		if(wolinkInfoVO==null) {
-			throwReturnMessage("不存在对应订单序号标准类型信息");
-		}
-        Wogylx wogylx = gpfkDao.queryById(Wogylx.class, wolinkInfoVO.getWogylxid());
-        if(!NumberUtils.equals(wogylx.getXh(),0)){
-            Wogylx existLastWogylx = gpfkDao.getLastGx(wogylx);
-            if(existLastWogylx != null){
-            	GpfkCondition gpfkCondition2 =new GpfkCondition();
-            	gpfkCondition2.setWogylx(existLastWogylx.getId());
-            	gpfkCondition2.setWosnid(wosn);
-            	gpfkCondition2.setBzgxid(existLastWogylx.getBzgxid());
-            	GpfkVO gpfk2 = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition2);
-            	if(gpfk2!=null) {
-            		if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
-            			GphyCondition gphyCondition =new GphyCondition();
-            			gphyCondition.setMid(gpfk2.getId());
-            			if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
-            				throwReturnMessage("上道工序未完成不能装配此道工序");
-            			}
-            		}
-            	}
-            	else {
-            		throwReturnMessage("上道工序未完成不能装配此道工序");
-            	}
-            }
-        }
-		if(!wolinkInfoVO.getWozt().equals("R")) {
-			throwReturnMessage("订单未下达");
-		}
-		if(gpfkVo==null) {
-			Gpfk gpfk = new Gpfk();
-			gpfk.setWosnid(wolinkInfoVO.getWosnCode());
-			gpfk.setWogylx(wolinkInfoVO.getWogylxid());
-			gpfk.setFkgx(wolinkInfoVO.getBzgxid());
-			gpfk.setFkrid(UserInfoUtil.getId());
-			gpfk.setFkr(UserInfoUtil.getUserName());
-			gpfk.setFksj(DateUtils.getDate());
-			gpfk.setWlid(wolinkInfoVO.getWlid());
-			insert(gpfk);
-			gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
-		}
-		return gpfkVo;
-	}
 
-	@Override
-	public Gpfk jyfk(String fkid, String hgsn) {
-		GpfkCondition gpfkCondition = new GpfkCondition();
-		gpfkCondition.setId(fkid);
-		GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
-		Gpfk gpfk = new Gpfk();
-		EntityDataFactory.copyEntity(gpfkVo, gpfk);
-		if(SmCodeEnum.OKBZ.getId().equals(hgsn)) {
-			gpfk.setHgbz("Y");
-			gpfk.setHgsl(1.0);
-			gpfk.setBhgsl(0.0);
-		}
-		else if(SmCodeEnum.NGBZ.getId().equals(hgsn)) {
-			gpfk.setHgbz("N");
-			gpfk.setHgsl(0.0);
-			gpfk.setBhgsl(1.0);
-		}
-		else {
-			throwReturnMessage(SmCodeEnum.ERROR_CODE); 
-		}
-		Gpfk gpfkR = (Gpfk) update(gpfk);
-		Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfk.getWogylx());
-		if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
-        	if(StringUtils.isNotEmpty(gpfk.getHgbz())&&gpfk.getHgbz().equals("N")) {
-        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
-        	}
-        	else {
-        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
-        	}
-        } 
-		return gpfkR;
-	}
-	
-	@Override
-	public Gpfk wxfk(String fkid, String hgsn) {
-		GpfkCondition gpfkCondition = new GpfkCondition();
-		gpfkCondition.setId(fkid);
-		GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
-		Gpfk gpfk = new Gpfk();
-		EntityDataFactory.copyEntity(gpfkVo, gpfk);
-		if(SmCodeEnum.OKBZ.getId().equals(hgsn)) {
-			gpfk.setHgbz("Y");
-			gpfk.setHgsl(1.0);
-			gpfk.setBhgsl(0.0);
-		}
-		else if(SmCodeEnum.NGBZ.getId().equals(hgsn)) {
-			gpfk.setHgbz("N");
-			gpfk.setHgsl(0.0);
-			gpfk.setBhgsl(1.0);
-		}
-		else {
-			throwReturnMessage(SmCodeEnum.ERROR_CODE); 
-		}
-		Gpfk gpfkR = (Gpfk) update(gpfk);
-		Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfk.getWogylx());
-		if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
-        	if(StringUtils.isNotEmpty(gpfk.getHgbz())&&gpfk.getHgbz().equals("N")) {
-        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
-        	}
-        	else {
-        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
-        	}
-        } 
-		return gpfkR;
-	}
 
 	@Override
 	public BzgxVO login(String usersn, String bzgxid) {
@@ -994,5 +884,424 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		}
 	}
 
+	@Override
+	public String checkSnType(String snid) {
+		List<SmCodeModel> commonBzModel = SmCodeEnum.queryCommonBz();
+		if(commonBzModel!=null&&commonBzModel.size()>0) {
+			for(SmCodeModel smCodeModel:commonBzModel) {
+				if(snid.toUpperCase().equals(smCodeModel.getId())) {
+					return smCodeModel.getId();
+				}
+			}
+		}
+		if(gpfkDao.checkIfContainsWosn(snid)!=0) {
+			return SmCodeEnum.WOSNID.getId();
+		}
+		if(StringUtils.isNotEmpty(coderuleService.matchCodeByRule(snid))){
+			return SmCodeEnum.WLID.getId();
+		}
+		return null;
+	}
+
+	@Override
+	public FkVO zpfk(FkCondition fkCondition) {
+		if(StringUtils.isNotEmpty(fkCondition.getSncode())) {
+			throwReturnMessage("未扫描到条码，请重新确认！");
+		}
+		if(StringUtils.isNotEmpty(fkCondition.getBzgxid())) {
+			throwReturnMessage("扫描工序出错，请重新确认！");
+		}
+		String snType = checkSnType(fkCondition.getSncode());
+		if(StringUtils.isEmpty(snType)) {
+			throwReturnMessage("该条码为未知条码，请重新确认！");
+		}
+		FkVO fkVO = null;
+		if(snType.equals(SmCodeEnum.LOGOUT.getId())) {
+			fkVO = new FkVO();
+			fkVO.setSntype(snType);
+		}
+		else if(snType.equals(SmCodeEnum.WOSNID.getId())) {
+			GpfkCondition gpfkCondition = new GpfkCondition();
+			gpfkCondition.setWosnid(fkCondition.getSncode());
+			gpfkCondition.setBzgxid(fkCondition.getBzgxid());
+			FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+			if(curFkVo==null) {
+				throwReturnMessage("该订单不存在对应工序，请重新确认！");
+			}
+	        Wogylx wogylx = gpfkDao.queryById(Wogylx.class, curFkVo.getWogylxid());
+	        if(!NumberUtils.equals(wogylx.getXh(),0)){
+	            Wogylx existLastWogylx = gpfkDao.getLastGx(wogylx);
+	            if(existLastWogylx != null){
+	            	FkCondition fkCondition2 =new FkCondition();
+	            	fkCondition2.setWogylx(existLastWogylx.getId());
+	            	fkCondition2.setWosncode(fkCondition.getSncode());
+	            	fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
+	            	GpfkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
+	            	if(gpfkVo2!=null) {
+	            		if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
+	            			GphyCondition gphyCondition =new GphyCondition();
+	            			gphyCondition.setMid(gpfkVo2.getId());
+	            			if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
+	            				throwReturnMessage("上道工序未完成不能装配此道工序，请重新确认！");
+	            			}
+	            		}
+	            	}
+	            	else {
+	            		throwReturnMessage("上道工序未完成不能装配此道工序，请重新确认！");
+	            	}
+	            }
+	        }
+			if(!curFkVo.getWozt().equals("R")) {
+				throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
+			}
+			curFkVo.setSntype(snType);
+			return curFkVo;
+		}
+		else if(snType.equals(SmCodeEnum.WLID.getId())) {
+			String wlid = coderuleService.matchCodeByRule(fkCondition.getSncode());
+			fkCondition.setWlid(wlid);
+			if(gpfkDao.checkIfContainsWobomWl(fkCondition)<=0) {
+				throwReturnMessage("该订单下不存在该发放工序物料，请重新确认！");
+			}
+			if(StringUtils.isEmpty(fkCondition.getWosncode())) {
+				throwReturnMessage("该订单序列号未输入，请重新确认！");
+			}
+			FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+			if(curFkVo==null) {
+				throwReturnMessage("该订单不存在对应工序，请重新确认！");
+			}
+			GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
+			if(gpfkVo==null) {
+				Gpfk gpfk = new Gpfk();
+				gpfk.setWosnid(curFkVo.getWosnCode());
+				gpfk.setWogylx(curFkVo.getWogylxid());
+				gpfk.setFkgx(curFkVo.getBzgxid());
+				gpfk.setFkrid(UserInfoUtil.getId());
+				gpfk.setFkr(UserInfoUtil.getUserName());
+				gpfk.setFksj(DateUtils.getDate());
+				gpfk.setWlid(curFkVo.getWlid());
+				insert(gpfk);
+				gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
+			}
+			else {
+				Gpfk gpfk = new Gpfk();
+				EntityDataFactory.copyEntity(gpfkVo, gpfk);
+				gpfk.setFkgx(curFkVo.getBzgxid());
+				gpfk.setFkrid(UserInfoUtil.getId());
+				gpfk.setFkr(UserInfoUtil.getUserName());
+				gpfk.setFksj(DateUtils.getDate());
+				update(gpfk);
+				gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
+			}
+			GphyCondition hyCondition =new GphyCondition();
+			hyCondition.setMid(gpfkVo.getId());
+			hyCondition.setSnid(fkCondition.getSncode());
+			if( gpfkDao.checkIfContainsGphywl(hyCondition)<=0) {
+				throwReturnMessage("该序列号已经被扫描");
+			}
+			if(gphyService.compareIsZpComplete(gpfkVo.getId(),wlid)) {
+				Gphy gphy = new Gphy();
+				gphy.setFkgx(gpfkVo.getFkgx());
+				gphy.setWlid(wlid);
+				gphy.setMid(gpfkVo.getId());
+				gphy.setWlsnid(fkCondition.getSncode());
+				gphy.setFksj(DateUtils.getDate());
+				gphy.setZpsl(1.0);
+				gphy.setHylx(HzGylxEnum.ZP.getId());
+				gphyService.insert(gphy);
+			}
+			if(gphyDao.queryIfZpwc(hyCondition)!=0) {
+				Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx());
+				if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
+		        	if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
+		        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
+		        	}
+		        	else {
+		        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
+		        	}
+		        } 
+			}
+		}
+		else {
+			throwReturnMessage("序列号类型错误，请重新确认！");
+		}
+		return fkVO;
+		
+	}
+
+	@Override
+	public FkVO jyfk(FkCondition fkCondition) {
+		if(StringUtils.isNotEmpty(fkCondition.getSncode())) {
+			throwReturnMessage("未扫描到条码，请重新确认！");
+		}
+		if(StringUtils.isNotEmpty(fkCondition.getBzgxid())) {
+			throwReturnMessage("扫描工序出错，请重新确认！");
+		}
+		String snType = checkSnType(fkCondition.getSncode());
+		if(StringUtils.isEmpty(snType)) {
+			throwReturnMessage("该条码为未知条码，请重新确认！");
+		}
+		FkVO fkVO = null;
+		if(snType.equals(SmCodeEnum.LOGOUT.getId())) {
+			fkVO = new FkVO();
+			fkVO.setSntype(snType);
+		}
+		else if(snType.equals(SmCodeEnum.WOSNID.getId())) {
+			GpfkCondition gpfkCondition = new GpfkCondition();
+			gpfkCondition.setWosnid(fkCondition.getSncode());
+			gpfkCondition.setBzgxid(fkCondition.getBzgxid());
+			FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+			if(curFkVo==null) {
+				throwReturnMessage("该订单不存在对应工序，请重新确认！");
+			}
+			curFkVo.setSntype(snType);
+	        Wogylx wogylx = gpfkDao.queryById(Wogylx.class, curFkVo.getWogylxid());
+	        if(!NumberUtils.equals(wogylx.getXh(),0)){
+	            Wogylx existLastWogylx = gpfkDao.getLastGx(wogylx);
+	            if(existLastWogylx != null){
+	            	FkCondition fkCondition2 =new FkCondition();
+	            	fkCondition2.setWogylx(existLastWogylx.getId());
+	            	fkCondition2.setWosncode(fkCondition.getSncode());
+	            	fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
+	            	GpfkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
+	            	if(gpfkVo2!=null) {
+	            		if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
+	            			GphyCondition gphyCondition =new GphyCondition();
+	            			gphyCondition.setMid(gpfkVo2.getId());
+	            			if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
+	            				throwReturnMessage("上道工序未完成不能装配此道工序，请重新确认！");
+	            			}
+	            		}
+	            	}
+	            	else {
+	            		throwReturnMessage("上道工序未完成不能装配此道工序，请重新确认！");
+	            	}
+	            }
+	        }
+			if(!curFkVo.getWozt().equals("R")) {
+				throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
+			}
+			curFkVo.setSntype(snType);
+			return curFkVo;
+		}
+		else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
+			GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
+			if(gpfkVo==null) {
+				Gpfk gpfk = new Gpfk();
+				FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+				gpfk.setWosnid(curFkVo.getWosnCode());
+				gpfk.setWogylx(curFkVo.getWogylxid());
+				gpfk.setFkgx(curFkVo.getBzgxid());
+				gpfk.setFkrid(UserInfoUtil.getId());
+				gpfk.setFkr(UserInfoUtil.getUserName());
+				gpfk.setFksj(DateUtils.getDate());
+				gpfk.setWlid(curFkVo.getWlid());
+				gpfk.setHgbz("Y");
+				gpfk.setHgsl(1.0);
+				gpfk.setBhgsl(0.0);
+				insert(gpfk);
+			}
+			else {
+				Gpfk gpfk = new Gpfk();
+				EntityDataFactory.copyEntity(gpfkVo, gpfk);
+				gpfk.setHgbz("Y");
+				gpfk.setHgsl(1.0);
+				gpfk.setBhgsl(0.0);
+				update(gpfk);
+			}
+			FkVO newFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+			newFkVo.setSntype(snType);
+			Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx());
+			if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
+	        	if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
+	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
+	        	}
+	        	else {
+	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
+	        	}
+	        } 
+			return newFkVo;
+		}
+		else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
+			GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
+			if(gpfkVo==null) {
+				Gpfk gpfk = new Gpfk();
+				FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+				gpfk.setWosnid(curFkVo.getWosnCode());
+				gpfk.setWogylx(curFkVo.getWogylxid());
+				gpfk.setFkgx(curFkVo.getBzgxid());
+				gpfk.setFkrid(UserInfoUtil.getId());
+				gpfk.setFkr(UserInfoUtil.getUserName());
+				gpfk.setFksj(DateUtils.getDate());
+				gpfk.setWlid(curFkVo.getWlid());
+				gpfk.setHgbz("N");
+				gpfk.setHgsl(0.0);
+				gpfk.setBhgsl(1.0);
+				insert(gpfk);
+			}
+			else {
+				Gpfk gpfk = new Gpfk();
+				EntityDataFactory.copyEntity(gpfkVo, gpfk);
+				gpfk.setHgbz("N");
+				gpfk.setHgsl(0.0);
+				gpfk.setBhgsl(1.0);
+				update(gpfk);
+			}
+			FkVO newFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+			Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx());
+			if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
+	        	if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
+	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
+	        	}
+	        	else {
+	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
+	        	}
+	        } 
+			return newFkVo;
+		}
+		else {
+			throwReturnMessage("序列号类型错误，请重新确认！");
+		}
+		
+		return fkVO;
+	}
+
+	@Override
+	public FkVO wxfk(FkCondition fkCondition) {
+		if(StringUtils.isNotEmpty(fkCondition.getSncode())) {
+			throwReturnMessage("未扫描到条码，请重新确认！");
+		}
+		if(StringUtils.isNotEmpty(fkCondition.getBzgxid())) {
+			throwReturnMessage("扫描工序出错，请重新确认！");
+		}
+		String snType = checkSnType(fkCondition.getSncode());
+		if(StringUtils.isEmpty(snType)) {
+			throwReturnMessage("该条码为未知条码，请重新确认！");
+		}
+		FkVO fkVO = null;
+		if(snType.equals(SmCodeEnum.LOGOUT.getId())) {
+			fkVO = new FkVO();
+			fkVO.setSntype(snType);
+		}
+		else if(snType.equals(SmCodeEnum.WOSNID.getId())) {
+			GpfkCondition gpfkCondition = new GpfkCondition();
+			gpfkCondition.setWosnid(fkCondition.getSncode());
+			gpfkCondition.setBzgxid(fkCondition.getBzgxid());
+			FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+			if(curFkVo==null) {
+				throwReturnMessage("该订单不存在对应工序，请重新确认！");
+			}
+			curFkVo.setSntype(snType);
+	        Wogylx wogylx = gpfkDao.queryById(Wogylx.class, curFkVo.getWogylxid());
+	        if(!NumberUtils.equals(wogylx.getXh(),0)){
+	            Wogylx existLastWogylx = gpfkDao.getLastGx(wogylx);
+	            if(existLastWogylx != null){
+	            	FkCondition fkCondition2 =new FkCondition();
+	            	fkCondition2.setWogylx(existLastWogylx.getId());
+	            	fkCondition2.setWosncode(fkCondition.getSncode());
+	            	fkCondition2.setBzgxid(existLastWogylx.getBzgxid());
+	            	GpfkVO gpfkVo2 = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition2);
+	            	if(gpfkVo2!=null) {
+	            		if(existLastWogylx.getGylxid().equals(HzGylxEnum.ZP.getId())) {
+	            			GphyCondition gphyCondition =new GphyCondition();
+	            			gphyCondition.setMid(gpfkVo2.getId());
+	            			if(gphyDao.queryIfZpwc(gphyCondition)!=0) {
+	            				throwReturnMessage("上道工序未完成不能装配此道工序，请重新确认！");
+	            			}
+	            		}
+	            	}
+	            	else {
+	            		throwReturnMessage("上道工序未完成不能装配此道工序，请重新确认！");
+	            	}
+	            }
+	        }
+			if(!curFkVo.getWozt().equals("R")) {
+				throwReturnMessage("该订单未下达无法进行反馈，请重新确认！");
+			}
+			curFkVo.setSntype(snType);
+			return curFkVo;
+		}
+		else if(snType.equals(SmCodeEnum.OKBZ.getId())) {
+			GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
+			if(gpfkVo==null) {
+				Gpfk gpfk = new Gpfk();
+				FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+				gpfk.setWosnid(curFkVo.getWosnCode());
+				gpfk.setWogylx(curFkVo.getWogylxid());
+				gpfk.setFkgx(curFkVo.getBzgxid());
+				gpfk.setFkrid(UserInfoUtil.getId());
+				gpfk.setFkr(UserInfoUtil.getUserName());
+				gpfk.setFksj(DateUtils.getDate());
+				gpfk.setWlid(curFkVo.getWlid());
+				gpfk.setHgbz("Y");
+				gpfk.setHgsl(1.0);
+				gpfk.setBhgsl(0.0);
+				insert(gpfk);
+			}
+			else {
+				Gpfk gpfk = new Gpfk();
+				EntityDataFactory.copyEntity(gpfkVo, gpfk);
+				gpfk.setHgbz("Y");
+				gpfk.setHgsl(1.0);
+				gpfk.setBhgsl(0.0);
+				update(gpfk);
+			}
+			FkVO newFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+			newFkVo.setSntype(snType);
+			Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx());
+			if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
+	        	if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
+	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
+	        	}
+	        	else {
+	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
+	        	}
+	        } 
+			return newFkVo;
+		}
+		else if(snType.equals(SmCodeEnum.NGBZ.getId())) {
+			GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
+			if(gpfkVo==null) {
+				Gpfk gpfk = new Gpfk();
+				FkVO curFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+				gpfk.setWosnid(curFkVo.getWosnCode());
+				gpfk.setWogylx(curFkVo.getWogylxid());
+				gpfk.setFkgx(curFkVo.getBzgxid());
+				gpfk.setFkrid(UserInfoUtil.getId());
+				gpfk.setFkr(UserInfoUtil.getUserName());
+				gpfk.setFksj(DateUtils.getDate());
+				gpfk.setWlid(curFkVo.getWlid());
+				gpfk.setHgbz("N");
+				gpfk.setHgsl(0.0);
+				gpfk.setBhgsl(1.0);
+				insert(gpfk);
+			}
+			else {
+				Gpfk gpfk = new Gpfk();
+				EntityDataFactory.copyEntity(gpfkVo, gpfk);
+				gpfk.setHgbz("N");
+				gpfk.setHgsl(0.0);
+				gpfk.setBhgsl(1.0);
+				update(gpfk);
+			}
+			FkVO newFkVo =gpfkDao.queryKwellWoBySnid(fkCondition.getSncode(), fkCondition.getBzgxid());
+			Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfkVo.getWogylx());
+			if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
+	        	if(StringUtils.isNotEmpty(gpfkVo.getHgbz())&&gpfkVo.getHgbz().equals("N")) {
+	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
+	        	}
+	        	else {
+	        		updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
+	        	}
+	        } 
+			return newFkVo;
+		}
+		else {
+			throwReturnMessage("序列号类型错误，请重新确认！");
+		}
+		
+		return fkVO;
+	}
+
 	
 }

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.common.sql.GavelSql;
-import com.gavel.common.utils.DateUtils;
-import com.gavel.common.utils.StringUtils;
-import com.gavel.jcsj.service.CoderuleService;
 import com.gavel.kwell.dao.GpfkDao;
 import com.gavel.kwell.dao.GphyDao;
-import com.gavel.kwell.persistent.Gpfk;
 import com.gavel.kwell.persistent.Gphy;
-import com.gavel.kwell.service.GpfkService;
 import com.gavel.kwell.service.GphyService;
-import com.gavel.kwell.utils.HzGylxEnum;
 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.wo.persistent.Wobom;
-import com.gavel.wo.persistent.Wogylx;
-import com.gavel.wo.vo.WobomVO;
 
 
 @Service("gphyService")
@@ -38,12 +26,6 @@ public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService
     @Autowired
     private GpfkDao gpfkDao;
     
-    @Autowired
-    private GpfkService gpfkService;
-    
-    @Autowired
-    private CoderuleService coderuleService;
-
     @Override
     public void initService() {
         addMaster( Gphy.class);
@@ -74,45 +56,6 @@ public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService
 		
 	}
 	
-	@Override
-	public Gpfk zpwl(GphyCondition condition) {
-		List<GphyVO> dbGphy = gphyDao.queryKwellZpGphy(condition).getRecords();
-		if(dbGphy!=null&&dbGphy.size()>0) {
-			throwReturnMessage("该序列号已经被扫描");
-		}
-		String wlid = coderuleService.matchCodeByRule(condition.getSnid());
-		if(StringUtils.isEmpty(wlid)) {
-			throwReturnMessage("不存在该物料");
-		}
-		List<WobomVO> woboms = gpfkDao.queryWobomByFkidAndWlid(condition.getMid(), wlid, condition.getGxid());
-		if(woboms==null||woboms.size()<=0) {
-			throwReturnMessage("该订单不存在该物料");
-		}
-		if(compareIsZpComplete(condition.getFkid(),wlid)) {
-			Gphy gphy = new Gphy();
-			gphy.setFkgx(condition.getGxid());
-			gphy.setWlid(wlid);
-			gphy.setMid(condition.getFkid());
-			gphy.setWlsnid(condition.getSnid());
-			gphy.setFksj(DateUtils.getDate());
-			gphy.setZpsl(1.0);
-			gphy.setHylx(HzGylxEnum.ZP.getId());
-			insert(gphy);
-		}
-		Gpfk gpfk =  gpfkDao.queryById(Gpfk.class, condition.getFkid());
-		if(gphyDao.queryIfZpwc(condition)!=0) {
-			Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfk.getWogylx());
-			if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
-	        	if(StringUtils.isNotEmpty(gpfk.getHgbz())&&gpfk.getHgbz().equals("N")) {
-	        		gpfkService.updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
-	        	}
-	        	else {
-	        		gpfkService.updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
-	        	}
-	        } 
-		}
-		return gpfk;
-	}
 
 	@Override
 	public boolean compareIsZpComplete(String fkid,String wlid) {

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

@@ -8,7 +8,7 @@ public enum SmCodeEnum {
 
 	LOGOUT("LOGOUT", "退出","LOGOUT",10),
 	WOSNID("WOSNID","工单序列号","2",10),
-//	WLID("WLID","物料编码","D",10),
+	WLID("WLID","物料编码","D",10),
 	OKBZ("OKBZ","OK按钮","OK",10),
 	NGBZ("NGBZ","NG按钮","NG",10);
 	
@@ -70,4 +70,20 @@ public enum SmCodeEnum {
         }
 		return list;
 	}
+	
+	
+	public static List<SmCodeModel> queryCommonBz(){
+		List<SmCodeModel> list = new ArrayList<>();
+		for (SmCodeEnum e : SmCodeEnum.values()) {
+			if(!e.getId().equals(WOSNID.id)&&!e.getId().equals(WLID.id)) {
+				SmCodeModel moduleParams = new SmCodeModel();
+				moduleParams.setId(e.getId());
+				moduleParams.setLen(e.getLen());
+				moduleParams.setName(e.getName());
+				moduleParams.setPrefix(e.getPrefix());
+	            list.add(moduleParams);
+			}
+        }
+		return list;
+	}
 }

gavel/src/main/java/com/gavel/kwell/vo/FkCondition.java

+package com.gavel.kwell.vo;
+
+import com.gavel.common.base.entity.BaseEntity;
+
+public class FkCondition extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	private String sncode;
+	private String bzgxid;
+	private String woid;
+	private String wlxxId;
+	private String wosncode;
+	private String wogylx;
+	private String wlid;
+	
+	public String getWlid() {
+		return wlid;
+	}
+	public void setWlid(String wlid) {
+		this.wlid = wlid;
+	}
+	public String getWogylx() {
+		return wogylx;
+	}
+	public void setWogylx(String wogylx) {
+		this.wogylx = wogylx;
+	}
+	public String getWosncode() {
+		return wosncode;
+	}
+	public void setWosncode(String wosncode) {
+		this.wosncode = wosncode;
+	}
+	public String getWoid() {
+		return woid;
+	}
+	public void setWoid(String woid) {
+		this.woid = woid;
+	}
+	public String getSncode() {
+		return sncode;
+	}
+	public void setSncode(String sncode) {
+		this.sncode = sncode;
+	}
+	public String getBzgxid() {
+		return bzgxid;
+	}
+	public void setBzgxid(String bzgxid) {
+		this.bzgxid = bzgxid;
+	}
+	public String getWlxxId() {
+		return wlxxId;
+	}
+	public void setWlxxId(String wlxxId) {
+		this.wlxxId = wlxxId;
+	}
+	
+}

gavel/src/main/java/com/gavel/kwell/vo/FkVO.java

+package com.gavel.kwell.vo;
+
+import java.util.Date;
+
+import com.gavel.common.base.entity.BaseEntity;
+import com.gavel.common.utils.CodeStrategy;
+import com.gavel.persistence.annotation.FieldMeta;
+
+
+public class FkVO extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+	
+	@FieldMeta(fieldName = "GPFK_ID", caption = "ID", primaryKey = true, notEmpty = true, codeStrategy = CodeStrategy.UUID)
+	private String id;
+	@FieldMeta(fieldName = "GPFK_WOSNID", caption = "WOSN编码")
+	private String wosnid;
+	@FieldMeta(fieldName = "GPFK_FKSJ", caption = "反馈时间")
+	private Date fksj;
+	@FieldMeta(fieldName = "GPFK_FKJSSJ", caption = "反馈结束时间")
+	private Date fkjssj;
+	@FieldMeta(fieldName = "GPFK_WOGYLX", caption = "订单工艺路线ID ")
+	private String wogylx;
+	@FieldMeta(fieldName = "GPFK_HGBZ", caption = "合格标志")
+	private String hgbz;
+	@FieldMeta(fieldName = "GPFK_FKSL", caption = "反馈数量")
+	private Double fksl;
+	@FieldMeta(fieldName = "GPFK_HGSL", caption = "合格数量")
+	private Double hgsl;
+	@FieldMeta(fieldName = "GPFK_BHGSL", caption = "不合格数量")
+	private Double bhgsl;
+	@FieldMeta(fieldName = "GPFK_FKR", caption = "反馈人")
+	private String fkr;
+	@FieldMeta(fieldName = "GPFK_FKRID", caption = "反馈人")
+	private String fkrid;
+	@FieldMeta(fieldName = "GPFK_FKGX", caption = "反馈工序")
+	private String fkgx;
+	@FieldMeta(fieldName = "GPFK_FKBX", caption = "反馈班型")
+	private String fkbx;
+	@FieldMeta(fieldName = "GPFK_BZ", caption = "备注")
+	private String bz;
+	@FieldMeta(fieldName = "GPFK_WHRID", caption = "维护人编码", autoUserId = true)
+	private String whrid;
+	@FieldMeta(fieldName = "GPFK_WHR", caption = "维护人", autoUserName = true)
+	private String whr;
+	@FieldMeta(fieldName = "GPFK_WHSJ", caption = "维护时间", autoDateTime = true)
+	private Date whsj;
+	@FieldMeta(fieldName = "GPFK_CJRID", caption = "创建人编码", autoUserId = true, initial = true)
+	private String cjrid;
+	@FieldMeta(fieldName = "GPFK_CJR", caption = "创建人", autoUserName = true, initial = true)
+	private String cjr;
+	@FieldMeta(fieldName = "GPFK_CJSJ", caption = "创建时间", autoDateTime = true, initial = true)
+	private Date cjsj;
+	@FieldMeta(fieldName = "GPFK_SYSVERSION", caption = "系统版本")
+	private Integer sysversion;
+	@FieldMeta(fieldName = "GPFK_FKLX", caption = "反馈类型")
+	private String fklx;
+
+	@FieldMeta(fieldName = "GPFK_FXSL", caption = "返修数量")
+	private Double fxsl;
+	@FieldMeta(fieldName = "GPFK_GFSL", caption = "工废数量")
+	private Double gfsl;
+	@FieldMeta(fieldName = "GPFK_LFSL", caption = "料废数量")
+	private Double lfsl;
+	@FieldMeta(fieldName = "GPFK_FGSL", caption = "返工数量")
+	private Double fgsl;
+
+	@FieldMeta(fieldName = "GPFK_YKRKSL", caption = "入库单数量")
+	private Double ykrksl;
+
+	@FieldMeta(fieldName = "GPFK_FKPH", caption = "反馈批号")
+	private String fkph;
+
+	@FieldMeta(fieldName = "GPFK_SCHS", caption = "生产耗时")
+	private Double schs;
+
+	@FieldMeta(fieldName = "GPFK_TMHS", caption = "调模耗时")
+	private Double tmhs;
+
+	@FieldMeta(fieldName = "GPFK_XJHS", caption = "修机耗时")
+	private Double xjhs;
+
+	@FieldMeta(fieldName = "GPFK_QTHS", caption = "其他耗时")
+	private Double qths;
+
+	@FieldMeta(fieldName = "GPFK_FKSJD", caption = "反馈时间段")
+	private String fksjd;
+
+	@FieldMeta(fieldName = "GPFK_YWRQ", caption = "业务日期")
+	private Date ywrq;
+
+	@FieldMeta(fieldName = "GPFK_HGDJ", caption = "合格等级")
+	private String hgdj;
+
+	@FieldMeta(fieldName = "GPFK_WLID", caption = "物料编码")
+	private String wlid;
+	@FieldMeta(fieldName = "BX_CODE", caption = "班型编码")
+	private String bxCode;
+	@FieldMeta(fieldName = "BX_NAME", caption = "班型名称")
+	private String bxName;
+
+	@FieldMeta(fieldName = "BZGX_CODE", caption = "工序编码")
+	private String bzgxCode;
+	@FieldMeta(fieldName = "BZGX_NAME", caption = "工序名称")
+	private String bzgxName;
+
+	@FieldMeta(fieldName = "GZZX_CODE", caption = "工作中心编码")
+	private String gzzxCode;
+	@FieldMeta(fieldName = "GZZX_NAME", caption = "工作中心名称")
+	private String gzzxName;
+
+	@FieldMeta(fieldName = "WLXX_ID", caption = "物料编码")
+	private String wlxxId;
+
+	@FieldMeta(fieldName = "WLXX_CODE", caption = "物料编码")
+	private String wlxxCode;
+	@FieldMeta(fieldName = "WLXX_NAME", caption = "物料名称")
+	private String wlxxName;
+	@FieldMeta(fieldName = "WLXX_GG", caption = "规格")
+	private String wlxxGg;
+
+	@FieldMeta(fieldName = "WO_DJID", caption = "任务单号")
+	private String woDjid;
+	
+	@FieldMeta(fieldName = "WO_ID", caption = "任务id")
+	private String woid;
+
+	@FieldMeta(fieldName = "BZGX_GXLX", caption = "工序类型")
+	private String bzgxGxlx;
+
+	@FieldMeta(fieldName = "JLDW_NAME", caption = "计量单位")
+	private String jldwName;
+
+	@FieldMeta(caption = "工序耗时")
+	private Double gxhs;
+
+	@FieldMeta(fieldName = "dpgpfk", caption = "大屏反馈标志" )
+	private String dpgpfk;
+
+	@FieldMeta(fieldName = "hgdjname", caption = "合格等级名称" )
+	private String hgdjname;
+
+
+	@FieldMeta(fieldName = "WOSN_KHCODE", caption = "客户序列号")
+	private String khcode;
+
+	@FieldMeta(fieldName = "SNWEEK", caption = "条码创建周")
+	private String snweek;
+
+    @FieldMeta(fieldName = "SNYEAR", caption = "条码创建年")
+    private String snyear;
+    
+	@FieldMeta(fieldName = "WOSN_CODE", caption = "序列号")
+	private String wosnCode;
+	@FieldMeta(fieldName = "WOSN_ID", caption = "条码ID")
+	private String wosnRealId;
+	@FieldMeta(fieldName = "BZGX_ID", caption = "工序名称")
+	private String bzgxid;
+	@FieldMeta(fieldName = "WOGYLX_ID", caption = "反馈工序ID" )
+	private String wogylxid;
+	@FieldMeta(fieldName = "WO_ZT", caption = "订单状态" )
+	private String wozt;
+	
+	@FieldMeta(caption = "sn类型")
+	private String sntype;
+	
+	
+	@FieldMeta(caption = "装配标志")
+	private String zpbz;
+	
+    public String getZpbz() {
+		return zpbz;
+	}
+
+	public void setZpbz(String zpbz) {
+		this.zpbz = zpbz;
+	}
+
+	public String getSntype() {
+		return sntype;
+	}
+
+	public void setSntype(String sntype) {
+		this.sntype = sntype;
+	}
+
+	public String getSnyear() {
+        return snyear;
+    }
+
+    public void setSnyear(String snyear) {
+        this.snyear = snyear;
+    }
+
+    public String getSnweek() {
+		return snweek;
+	}
+
+	public void setSnweek(String snweek) {
+		this.snweek = snweek;
+	}
+
+
+	public String getKhcode() {
+		return khcode;
+	}
+
+	public void setKhcode(String khcode) {
+		this.khcode = khcode;
+	}
+
+	public String getHgdjname() {
+		return hgdjname;
+	}
+
+	public void setHgdjname(String hgdjname) {
+		this.hgdjname = hgdjname;
+	}
+
+	public String getBzgxCode() {
+		return bzgxCode;
+	}
+
+	public void setBzgxCode(String bzgxCode) {
+		this.bzgxCode = bzgxCode;
+	}
+
+	public String getBzgxName() {
+		return bzgxName;
+	}
+
+	public void setBzgxName(String bzgxName) {
+		this.bzgxName = bzgxName;
+	}
+
+	public String getWlxxCode() {
+		return wlxxCode;
+	}
+
+	public void setWlxxCode(String wlxxCode) {
+		this.wlxxCode = wlxxCode;
+	}
+
+	public String getWlxxName() {
+		return wlxxName;
+	}
+
+	public void setWlxxName(String wlxxName) {
+		this.wlxxName = wlxxName;
+	}
+
+	public String getWlxxGg() {
+		return wlxxGg;
+	}
+
+	public void setWlxxGg(String wlxxGg) {
+		this.wlxxGg = wlxxGg;
+	}
+
+	public String getWoDjid() {
+		return woDjid;
+	}
+
+	public void setWoDjid(String woDjid) {
+		this.woDjid = woDjid;
+	}
+
+	public String getWoid() {
+		return woid;
+	}
+
+	public void setWoid(String woid) {
+		this.woid = woid;
+	}
+
+	public String getBxCode() {
+		return bxCode;
+	}
+
+	public void setBxCode(String bxCode) {
+		this.bxCode = bxCode;
+	}
+
+	public String getBxName() {
+		return bxName;
+	}
+
+	public void setBxName(String bxName) {
+		this.bxName = bxName;
+	}
+
+	public Double getGxhs() {
+		return gxhs;
+	}
+
+	public void setGxhs(Double gxhs) {
+		this.gxhs = gxhs;
+	}
+
+	public String getBzgxGxlx() {
+		return bzgxGxlx;
+	}
+
+	public void setBzgxGxlx(String bzgxGxlx) {
+		this.bzgxGxlx = bzgxGxlx;
+	}
+
+	public String getWlxxId() {
+		return wlxxId;
+	}
+
+	public void setWlxxId(String wlxxId) {
+		this.wlxxId = wlxxId;
+	}
+
+	public String getJldwName() {
+		return jldwName;
+	}
+
+	public void setJldwName(String jldwName) {
+		this.jldwName = jldwName;
+	}
+
+	public String getGzzxCode() {
+		return gzzxCode;
+	}
+
+	public void setGzzxCode(String gzzxCode) {
+		this.gzzxCode = gzzxCode;
+	}
+
+	public String getGzzxName() {
+		return gzzxName;
+	}
+
+	public void setGzzxName(String gzzxName) {
+		this.gzzxName = gzzxName;
+	}
+
+	public String getDpgpfk() {
+		return dpgpfk;
+	}
+
+	public void setDpgpfk(String dpgpfk) {
+		this.dpgpfk = dpgpfk;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getWosnid() {
+		return wosnid;
+	}
+
+	public void setWosnid(String wosnid) {
+		this.wosnid = wosnid;
+	}
+
+	public Date getFksj() {
+		return fksj;
+	}
+
+	public void setFksj(Date fksj) {
+		this.fksj = fksj;
+	}
+
+	public Date getFkjssj() {
+		return fkjssj;
+	}
+
+	public void setFkjssj(Date fkjssj) {
+		this.fkjssj = fkjssj;
+	}
+
+	public String getWogylx() {
+		return wogylx;
+	}
+
+	public void setWogylx(String wogylx) {
+		this.wogylx = wogylx;
+	}
+
+	public String getHgbz() {
+		return hgbz;
+	}
+
+	public void setHgbz(String hgbz) {
+		this.hgbz = hgbz;
+	}
+
+	public Double getFksl() {
+		return fksl;
+	}
+
+	public void setFksl(Double fksl) {
+		this.fksl = fksl;
+	}
+
+	public Double getHgsl() {
+		return hgsl;
+	}
+
+	public void setHgsl(Double hgsl) {
+		this.hgsl = hgsl;
+	}
+
+	public Double getBhgsl() {
+		return bhgsl;
+	}
+
+	public void setBhgsl(Double bhgsl) {
+		this.bhgsl = bhgsl;
+	}
+
+	public String getFkr() {
+		return fkr;
+	}
+
+	public void setFkr(String fkr) {
+		this.fkr = fkr;
+	}
+
+	public String getFkrid() {
+		return fkrid;
+	}
+
+	public void setFkrid(String fkrid) {
+		this.fkrid = fkrid;
+	}
+
+	public String getFkgx() {
+		return fkgx;
+	}
+
+	public void setFkgx(String fkgx) {
+		this.fkgx = fkgx;
+	}
+
+	public String getFkbx() {
+		return fkbx;
+	}
+
+	public void setFkbx(String fkbx) {
+		this.fkbx = fkbx;
+	}
+
+	public String getBz() {
+		return bz;
+	}
+
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+
+	public String getWhrid() {
+		return whrid;
+	}
+
+	public void setWhrid(String whrid) {
+		this.whrid = whrid;
+	}
+
+	public String getWhr() {
+		return whr;
+	}
+
+	public void setWhr(String whr) {
+		this.whr = whr;
+	}
+
+	public Date getWhsj() {
+		return whsj;
+	}
+
+	public void setWhsj(Date whsj) {
+		this.whsj = whsj;
+	}
+
+	public String getCjrid() {
+		return cjrid;
+	}
+
+	public void setCjrid(String cjrid) {
+		this.cjrid = cjrid;
+	}
+
+	public String getCjr() {
+		return cjr;
+	}
+
+	public void setCjr(String cjr) {
+		this.cjr = cjr;
+	}
+
+	public Date getCjsj() {
+		return cjsj;
+	}
+
+	public void setCjsj(Date cjsj) {
+		this.cjsj = cjsj;
+	}
+
+	public Integer getSysversion() {
+		return sysversion;
+	}
+
+	public void setSysversion(Integer sysversion) {
+		this.sysversion = sysversion;
+	}
+
+	public String getFklx() {
+		return fklx;
+	}
+
+	public void setFklx(String fklx) {
+		this.fklx = fklx;
+	}
+
+	public Double getFxsl() {
+		return fxsl;
+	}
+
+	public void setFxsl(Double fxsl) {
+		this.fxsl = fxsl;
+	}
+
+	public Double getGfsl() {
+		return gfsl;
+	}
+
+	public void setGfsl(Double gfsl) {
+		this.gfsl = gfsl;
+	}
+
+	public Double getLfsl() {
+		return lfsl;
+	}
+
+	public void setLfsl(Double lfsl) {
+		this.lfsl = lfsl;
+	}
+
+	public Double getFgsl() {
+		return fgsl;
+	}
+
+	public void setFgsl(Double fgsl) {
+		this.fgsl = fgsl;
+	}
+
+	public Double getYkrksl() {
+		return ykrksl;
+	}
+
+	public void setYkrksl(Double ykrksl) {
+		this.ykrksl = ykrksl;
+	}
+
+	public String getFkph() {
+		return fkph;
+	}
+
+	public void setFkph(String fkph) {
+		this.fkph = fkph;
+	}
+
+	public Double getSchs() {
+		return schs;
+	}
+
+	public void setSchs(Double schs) {
+		this.schs = schs;
+	}
+
+	public Double getTmhs() {
+		return tmhs;
+	}
+
+	public void setTmhs(Double tmhs) {
+		this.tmhs = tmhs;
+	}
+
+	public Double getXjhs() {
+		return xjhs;
+	}
+
+	public void setXjhs(Double xjhs) {
+		this.xjhs = xjhs;
+	}
+
+	public Double getQths() {
+		return qths;
+	}
+
+	public void setQths(Double qths) {
+		this.qths = qths;
+	}
+
+	public String getFksjd() {
+		return fksjd;
+	}
+
+	public void setFksjd(String fksjd) {
+		this.fksjd = fksjd;
+	}
+
+	public Date getYwrq() {
+		return ywrq;
+	}
+
+	public void setYwrq(Date ywrq) {
+		this.ywrq = ywrq;
+	}
+
+	public String getHgdj() {
+		return hgdj;
+	}
+
+	public void setHgdj(String hgdj) {
+		this.hgdj = hgdj;
+	}
+
+	public String getWlid() {
+		return wlid;
+	}
+
+	public void setWlid(String wlid) {
+		this.wlid = wlid;
+	}
+
+	public String getWosnCode() {
+		return wosnCode;
+	}
+
+	public void setWosnCode(String wosnCode) {
+		this.wosnCode = wosnCode;
+	}
+
+	public String getWosnRealId() {
+		return wosnRealId;
+	}
+
+	public void setWosnRealId(String wosnRealId) {
+		this.wosnRealId = wosnRealId;
+	}
+
+	public String getBzgxid() {
+		return bzgxid;
+	}
+
+	public void setBzgxid(String bzgxid) {
+		this.bzgxid = bzgxid;
+	}
+
+	public String getWogylxid() {
+		return wogylxid;
+	}
+
+	public void setWogylxid(String wogylxid) {
+		this.wogylxid = wogylxid;
+	}
+
+	public String getWozt() {
+		return wozt;
+	}
+
+	public void setWozt(String wozt) {
+		this.wozt = wozt;
+	}
+
+	
+
+}

gavel/src/main/java/com/gavel/kwell/vo/WolinkInfoVO.java

 package com.gavel.kwell.vo;
 
+import java.util.Date;
+
 import com.gavel.common.base.entity.BaseEntity;
 import com.gavel.persistence.annotation.FieldMeta;
 
 public class WolinkInfoVO extends BaseEntity {
+	
+	@FieldMeta(fieldName = "WOSN_ID", caption = "WOSN编码")
+	private String wosnid;
+	@FieldMeta(fieldName = "BZGX_CODE", caption = "工序编码")
+	private String bzgxCode;
+	@FieldMeta(fieldName = "BZGX_NAME", caption = "工序名称")
+	private String bzgxName;
+	@FieldMeta(fieldName = "WLXX_ID", caption = "物料编码")
+	private String wlxxId;
+	@FieldMeta(fieldName = "WLXX_CODE", caption = "物料编码")
+	private String wlxxCode;
+	@FieldMeta(fieldName = "WLXX_NAME", caption = "物料名称")
+	private String wlxxName;
+	@FieldMeta(fieldName = "WLXX_GG", caption = "规格")
+	private String wlxxGg;
+	@FieldMeta(fieldName = "WO_DJID", caption = "任务单号")
+	private String woDjid;
+	@FieldMeta(fieldName = "BZGX_GXLX", caption = "工序类型")
+	private String bzgxGxlx;
 	@FieldMeta(fieldName = "WLXX_ID", caption = "物料编码")
 	private String wlid;
 	@FieldMeta(fieldName = "WOSN_CODE", caption = "序列号")