提交返回检验结果接口

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

@@ -324,8 +324,12 @@ public class GpfkController extends BaseController {
             setReturnMessage("参数错误");
             return returnData();
         }
-        gpfkService.jyfk(fkid, hgsn);
-        return ThreadContext.getReturnData();
+        Gpfk gpfk =gpfkService.jyfk(fkid, hgsn);
+        if(gpfk != null){
+            return buildReturnData(gpfk);
+        }else{
+            return ThreadContext.getReturnData();
+        }
     }
     
     @RequestMapping(value = "/wxfk", method = RequestMethod.POST)
@@ -337,8 +341,12 @@ public class GpfkController extends BaseController {
             setReturnMessage("参数错误");
             return returnData();
         }
-        gpfkService.wxfk(fkid, hgsn);
-        return ThreadContext.getReturnData();
+        Gpfk gpfk =gpfkService.wxfk(fkid, hgsn);
+        if(gpfk != null){
+            return buildReturnData(gpfk);
+        }else{
+            return ThreadContext.getReturnData();
+        }
     }
     
     @RequestMapping(value = "/login", method = RequestMethod.POST)

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

@@ -7,6 +7,7 @@ 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.SystemOperation;
 import com.gavel.common.annotation.ResourcePermissions;
 import com.gavel.common.base.controller.BaseController;
@@ -45,7 +46,8 @@ public class GphyController extends BaseController {
     
     @RequestMapping(value = "/zpwl", method = RequestMethod.POST)
     @ResponseBody
-    public Object query(@RequestBody GphyCondition condition) {
+    public Object query(@RequestBody JSONObject param) {
+    	GphyCondition condition = JSONObject.toJavaObject(param, GphyCondition.class);
     	Integer code = gphyService.zpwl(condition);
     	if(code!=null&&code>0) {
     		return buildReturnData(code);

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

@@ -112,6 +112,7 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao {
 	        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("LEFT JOIN WLXX ON WLXX_ID = GPHY_WLID ");
 	        sqlMap.append("where 1 = 1 ");
 	        if (StringUtils.isNotEmpty(condition.getId())){
 	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPHY_ID", condition.getId()));

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

@@ -101,9 +101,9 @@ public interface GpfkService extends BaseEditService {
   
   public GpfkVO queryKwellWosnWithAddGpfk(String wosn,String bzlx);
   
-  public void jyfk(String fkid,String hgsn);
+  public Gpfk jyfk(String fkid,String hgsn);
   
-  public void wxfk(String fkid,String hgsn);
+  public Gpfk wxfk(String fkid,String hgsn);
   
   public BzgxVO login(String usersn,String bzgxid);
 	

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

@@ -892,7 +892,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	}
 
 	@Override
-	public void jyfk(String fkid, String hgsn) {
+	public Gpfk jyfk(String fkid, String hgsn) {
 		GpfkCondition gpfkCondition = new GpfkCondition();
 		gpfkCondition.setId(fkid);
 		GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
@@ -907,14 +907,17 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		else {
 			throwReturnMessage(SmCodeEnum.ERROR_CODE); 
 		}
-		update(gpfk);
+		Gpfk gpfkR = (Gpfk) update(gpfk);
+		return gpfkR;
 	}
 	
 	@Override
-	public void wxfk(String fkid, String hgsn) {
+	public Gpfk wxfk(String fkid, String hgsn) {
 		GpfkCondition gpfkCondition = new GpfkCondition();
 		gpfkCondition.setId(fkid);
-		Gpfk gpfk = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
+		GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
+		Gpfk gpfk = new Gpfk();
+		EntityDataFactory.copyEntity(gpfkVo, gpfk);
 		if(SmCodeEnum.OKBZ.getId().equals(hgsn)) {
 			gpfk.setHgsl(1.0);
 			gpfk.setBhgsl(0.0);
@@ -926,7 +929,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 		else {
 			throwReturnMessage(SmCodeEnum.ERROR_CODE); 
 		}
-		update(gpfk);
+		Gpfk gpfkR = (Gpfk) update(gpfk);
+		return gpfkR;
 	}
 
 	@Override

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

@@ -8,9 +8,9 @@ public enum SmCodeEnum {
 
 	LOGOUT("LOGOUT", "退出","LOGOUT",10),
 	WOSNID("WOSNID","工单序列号","20",10),
-	WLID("WLID","物料编码","WLID",10),
-	OKBZ("OKBZ","OK按钮","OKBZ",10),
-	NGBZ("NGBZ","NG按钮","NGBZ",10);
+	WLID("WLID","物料编码","D",10),
+	OKBZ("OKBZ","OK按钮","OK",10),
+	NGBZ("NGBZ","NG按钮","NG",10);
 	
 	private String id;
 	private String name;

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

@@ -22,7 +22,17 @@ public class GphyCondition extends BaseEntity {
     private String woid;
 
     private String snid;
+    
+    private String fkid;
+    
+    
 
+	public String getFkid() {
+		return fkid;
+	}
+	public void setFkid(String fkid) {
+		this.fkid = fkid;
+	}
 	public String getId() {
 		return id;
 	}