反馈业务修改，建立反馈结果表

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

 package com.gavel.kwell.controller;
 
 import java.io.FileInputStream;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -330,6 +331,16 @@ public class GpfkController extends BaseController {
         return ThreadContext.getReturnData();
     }
     
+    @RequestMapping("/queryKsrqAndJsrq")
+    public String queryKsrqAndJsrq(HttpServletRequest request) {
+    	
+    	String agent = request.getHeader("User-Agent");
+    	if ( agent.contains("iPhone") || agent.contains("Android")   ) {
+    		logger.info("移动端访问; User-Agent: " + agent);
+    	}
+        return "loginscan_view";
+    }
+    
     
     @RequestMapping("/loginscan_view")
     public String login_view(HttpServletRequest request) {
@@ -339,4 +350,5 @@ public class GpfkController extends BaseController {
     	}
         return "loginscan_view";
     }
+    
 }

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

+package com.gavel.kwell.controller;
+
+import com.gavel.common.BaseURL;
+import com.gavel.common.base.BaseEditJSON;
+import com.gavel.common.base.controller.BaseController;
+import com.gavel.common.converter.DataConvert;
+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.persistence.sql.RecordSet;
+import com.gavel.common.annotation.ResourcePermissions;
+import com.gavel.common.SystemOperation;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gavel.common.utils.ThreadContext;
+
+import com.gavel.kwell.service.GpfkjgService;
+import com.gavel.kwell.vo.GpfkjgCondition;
+import com.gavel.kwell.vo.GpfkjgVO;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping("kmes/gpfkjg")
+public class GpfkjgController extends BaseController {
+
+    @Autowired
+    private GpfkjgService gpfkjgService;
+
+    @ResourcePermissions()
+    @RequestMapping("/index")
+    public String index() {
+        return "kmes/gpfkjg/index";
+    }
+
+    @ResourcePermissions({SystemOperation.BottonResource.ADD})
+    @RequestMapping("/add")
+    public String add() {
+        return "kmes/gpfkjg/edit";
+    }
+
+    @ResourcePermissions({SystemOperation.BottonResource.EDIT})
+    @RequestMapping("/edit")
+    public String edit() {
+        return "kmes/gpfkjg/edit";
+    }
+
+    @RequestMapping(value = BaseURL.GET, method = RequestMethod.POST)
+    @ResponseBody
+    public Object get(@RequestBody JSONObject param) {
+        GpfkjgCondition condition = DataConvert.getCondition(param, GpfkjgCondition.class);
+        RecordSet<GpfkjgVO> records = gpfkjgService.query(condition);
+        if ( records.getRecords()!=null && records.getRecords().size()>=1 ){
+            return buildReturnData(GpfkjgVO.class, records.getRecords().get(0));
+        }
+        return buildReturnData(GpfkjgVO.class, null);
+    }
+	
+    @RequestMapping(value = BaseURL.QUERY, method = RequestMethod.POST)
+    @ResponseBody
+    public Object query(@RequestBody JSONObject param) {
+        GpfkjgCondition condition = DataConvert.getCondition(param, GpfkjgCondition.class);
+        RecordSet<GpfkjgVO> records = gpfkjgService.query(condition);
+        return buildReturnData(records, GpfkjgVO.class);
+    }
+
+    @ResourcePermissions(SystemOperation.BottonResource.ADD)
+    @RequestMapping(value = BaseURL.ADD, method = RequestMethod.POST)
+    @ResponseBody
+    public Object insert(@RequestBody JSONObject param) {
+        BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
+        gpfkjgService.insert(editJson);
+        return ThreadContext.getReturnData();
+    }
+
+    @ResourcePermissions(SystemOperation.BottonResource.EDIT)
+    @RequestMapping(value = BaseURL.UPDATE, method = RequestMethod.POST)
+    @ResponseBody
+    public Object update(@RequestBody JSONObject param) {
+        BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
+        gpfkjgService.update(editJson);
+        return ThreadContext.getReturnData();
+    }
+
+    @ResourcePermissions(SystemOperation.BottonResource.DELETE)
+    @RequestMapping(value = BaseURL.DELETE, method = RequestMethod.POST)
+    @ResponseBody
+    public Object delete(@RequestBody JSONObject param) {
+        BaseEditJSON editJson = BaseEditJSON.parseJSON(param);
+        gpfkjgService.delete(editJson);
+        return ThreadContext.getReturnData();
+    }
+
+    @ResourcePermissions(SystemOperation.BottonResource.EXPORT)
+    @RequestMapping(value = BaseURL.EXPORT, method = RequestMethod.POST)
+    @ResponseBody
+    public void export(HttpServletRequest request,HttpServletResponse response, @RequestBody JSONObject param) throws Exception {
+        GpfkjgCondition condition = DataConvert.getCondition(param, GpfkjgCondition.class);
+        RecordSet<GpfkjgVO> records = gpfkjgService.query(condition);
+        doExport(request, response, param, records.getRecords());
+    }
+
+
+}

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

@@ -147,8 +147,12 @@ public interface GpfkDao extends BaseDao {
    public FkVO queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(String wosnid,String bzgxid);
    /**获取该序列号标准工序所有的反馈相关信息 */
    public List<FkVO> queryWowithIfExistGpfkByWosnAndBzgxid(String wosnid,String bzgxid);
+   /**获取该序列号维修标准工序最新的反馈相关信息 */
+   public FkVO queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(String wosnid,String bzgxid);
    /**获取该序列号标准工序的订单相关信息包含最新反馈记录 */
    public FkVO queryKwellWoBySnidUptoDate(String wosnid, String bzgx);
+   /**获取该序列号标准工序的订单相关信息不包含最新反馈记录 */
+   public FkVO queryKwellWxWoBySnidUptoDate(String wosnid);
    /**获取该序列号标准工序的订单相关信息包含最新反馈记录 */
    public List<FkVO> queryKwellAllGpfkByWosnAndGxid(FkCondition condition);
    /**查询当前订单序列号最新反馈记录 */
@@ -170,6 +174,8 @@ public interface GpfkDao extends BaseDao {
    /**查询当前订单序列号最新检验反馈记录 */
    public GpfkVO queryJyGpfkByWosnUptoDate(String wosnid);
    
+   public List<Wogylx> getNextGxContainSelf(Wogylx wogylx) ;
+   
    /** ------------END工票反馈升级-----------------***/
    
 }

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

+package com.gavel.kwell.dao;
+
+import com.gavel.common.base.dao.BaseDao;
+import com.gavel.persistence.sql.RecordSet;
+import com.gavel.kwell.persistent.Gpfkjg;
+import com.gavel.kwell.vo.GpfkjgCondition;
+import com.gavel.kwell.vo.GpfkjgVO;
+
+
+public interface GpfkjgDao extends BaseDao {
+
+   public RecordSet<GpfkjgVO> query(GpfkjgCondition condition);
+   
+   public Gpfkjg queryEntityByCondition(GpfkjgCondition condition);
+   
+   public int queryIfContainsmdfkgx(GpfkjgCondition condition);
+   
+   public void deleteByCondition(GpfkjgCondition condition);
+
+}

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

+package com.gavel.kwell.dao.impl;
+
+import com.gavel.common.base.dao.impl.BaseDaoImpl;
+import com.gavel.common.utils.StringUtils;
+import com.gavel.persistence.sql.RecordSet;
+import com.gavel.persistence.sql.SqlMap;
+import com.gavel.persistence.sql.SqlUtil;
+import org.springframework.stereotype.Repository;
+
+import com.gavel.kwell.dao.GpfkjgDao;
+import com.gavel.kwell.persistent.Gpfkjg;
+import com.gavel.kwell.vo.GpfkjgCondition;
+import com.gavel.kwell.vo.GpfkjgVO;
+
+
+@Repository("gpfkjgDao")
+public class GpfkjgDaoImpl extends BaseDaoImpl implements GpfkjgDao {
+	
+	public RecordSet<GpfkjgVO> query(GpfkjgCondition condition){
+		 SqlMap sqlMap = new SqlMap();
+        sqlMap.setPageNo(condition.getPageNo());
+        sqlMap.setRowCount(condition.getPageSize());
+        sqlMap.append("select GPFKJG_ID, GPFKJG_WOSNID, GPFKJG_FKSJ, GPFKJG_FKJSSJ, GPFKJG_HGBZ, ");
+        sqlMap.append("   GPFKJG_FKSL, GPFKJG_HGSL, GPFKJG_BHGSL, GPFKJG_FKRID, GPFKJG_FKR, ");
+        sqlMap.append("   GPFKJG_FKGX, GPFKJG_FKBX, GPFKJG_BZ, GPFKJG_WHRID, GPFKJG_WHR, ");
+        sqlMap.append("   GPFKJG_WHSJ, GPFKJG_CJRID, GPFKJG_CJR, GPFKJG_CJSJ, GPFKJG_SYSVERSION, ");
+        sqlMap.append("   GPFKJG_FKLX, GPFKJG_FXSL, GPFKJG_GFSL, GPFKJG_LFSL, GPFKJG_FGSL, ");
+        sqlMap.append("   GPFKJG_YKRKSL, GPFKJG_FKPH, GPFKJG_SCHS, GPFKJG_TMHS, GPFKJG_XJHS, ");
+        sqlMap.append("   GPFKJG_QTHS, GPFKJG_FKSJD, GPFKJG_YWRQ, GPFKJG_HGDJ, GPFKJG_WLID, ");
+        sqlMap.append("   GPFKJG_BZGXID, GPFKJG_WOGYLX ");
+        sqlMap.append("from GPFKJG ");
+        sqlMap.append("where 1 = 1 ");
+        if (StringUtils.isNotEmpty(condition.getId())){
+            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_ID", condition.getId()));
+            sqlMap.setParamValue("GPFKJG_ID", condition.getId());
+            
+        }
+        if (StringUtils.isNotEmpty(condition.getWosncode())){
+            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_WOSNID", condition.getWosncode()));
+            sqlMap.setParamValue("GPFKJG_WOSNID", condition.getWosncode());
+            
+        }
+        if (StringUtils.isNotEmpty(condition.getBzgxid())){
+            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_BZGXID", condition.getBzgxid()));
+            sqlMap.setParamValue("GPFKJG_BZGXID", condition.getBzgxid());
+            
+        }
+        if (StringUtils.isNotEmpty(condition.getWlid())){
+            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_WLID", condition.getWlid()));
+            sqlMap.setParamValue("GPFKJG_WLID", condition.getWlid());
+            
+        }
+        sqlMap.query(GpfkjgVO.class);
+        return sqlMap.getRecordSet();
+
+	}
+
+	@Override
+	public Gpfkjg queryEntityByCondition(GpfkjgCondition condition) {
+			SqlMap sqlMap = new SqlMap();
+	        sqlMap.append("select GPFKJG_ID, GPFKJG_WOSNID, GPFKJG_FKSJ, GPFKJG_FKJSSJ, GPFKJG_HGBZ, ");
+	        sqlMap.append("   GPFKJG_FKSL, GPFKJG_HGSL, GPFKJG_BHGSL, GPFKJG_FKRID, GPFKJG_FKR, ");
+	        sqlMap.append("   GPFKJG_FKGX, GPFKJG_FKBX, GPFKJG_BZ, GPFKJG_WHRID, GPFKJG_WHR, ");
+	        sqlMap.append("   GPFKJG_WHSJ, GPFKJG_CJRID, GPFKJG_CJR, GPFKJG_CJSJ, GPFKJG_SYSVERSION, ");
+	        sqlMap.append("   GPFKJG_FKLX, GPFKJG_FXSL, GPFKJG_GFSL, GPFKJG_LFSL, GPFKJG_FGSL, ");
+	        sqlMap.append("   GPFKJG_YKRKSL, GPFKJG_FKPH, GPFKJG_SCHS, GPFKJG_TMHS, GPFKJG_XJHS, ");
+	        sqlMap.append("   GPFKJG_QTHS, GPFKJG_FKSJD, GPFKJG_YWRQ, GPFKJG_HGDJ, GPFKJG_WLID, ");
+	        sqlMap.append("   GPFKJG_BZGXID, GPFKJG_WOGYLX ");
+	        sqlMap.append("from GPFKJG ");
+	        sqlMap.append("where 1 = 1 ");
+	        if (StringUtils.isNotEmpty(condition.getId())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_ID", condition.getId()));
+	            sqlMap.setParamValue("GPFKJG_ID", condition.getId());
+	            
+	        }
+	        if (StringUtils.isNotEmpty(condition.getWosncode())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_WOSNID", condition.getWosncode()));
+	            sqlMap.setParamValue("GPFKJG_WOSNID", condition.getWosncode());
+	            
+	        }
+	        if (StringUtils.isNotEmpty(condition.getBzgxid())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_BZGXID", condition.getBzgxid()));
+	            sqlMap.setParamValue("GPFKJG_BZGXID", condition.getBzgxid());
+	            
+	        }
+	        if (StringUtils.isNotEmpty(condition.getWlid())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_WLID", condition.getWlid()));
+	            sqlMap.setParamValue("GPFKJG_WLID", condition.getWlid());
+	            
+	        }
+	        return sqlMap.queryEntity(Gpfkjg.class);
+	}
+	
+	@Override
+	public int queryIfContainsmdfkgx(GpfkjgCondition condition) {
+			SqlMap sqlMap = new SqlMap();
+	        sqlMap.append("select count(1) ");
+	        sqlMap.append("   from GPFKJG  ");
+	        sqlMap.append("   left join  WOGYLX on WOGYLX_ID = GPFKJG_FKGX ");
+	        sqlMap.append("   where IFNULL( WOGYLX_WGSL, 0 ) > 0 and (WOGYLX_GXBZ = 'D' or WOGYLX_GXBZ = 'M' )  ");
+	        if (StringUtils.isNotEmpty(condition.getId())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_ID", condition.getId()));
+	            sqlMap.setParamValue("GPFKJG_ID", condition.getId());
+	            
+	        }
+	        if (StringUtils.isNotEmpty(condition.getWosncode())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_WOSNID", condition.getWosncode()));
+	            sqlMap.setParamValue("GPFKJG_WOSNID", condition.getWosncode());
+	            
+	        }
+	        if (StringUtils.isNotEmpty(condition.getBzgxid())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_BZGXID", condition.getBzgxid()));
+	            sqlMap.setParamValue("GPFKJG_BZGXID", condition.getBzgxid());
+	            
+	        }
+	        if (StringUtils.isNotEmpty(condition.getWlid())){
+	            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_WLID", condition.getWlid()));
+	            sqlMap.setParamValue("GPFKJG_WLID", condition.getWlid());
+	            
+	        }
+	        return sqlMap.queryInt();
+	}
+
+	@Override
+	public void deleteByCondition(GpfkjgCondition condition) {
+		SqlMap sqlMap = new SqlMap();
+        sqlMap.append("delete  ");
+        sqlMap.append("   from GPFKJG  ");
+        sqlMap.append("   where 1=1 ");
+        if (StringUtils.isNotEmpty(condition.getId())){
+            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_ID", condition.getId()));
+            sqlMap.setParamValue("GPFKJG_ID", condition.getId());
+            
+        }
+        if (StringUtils.isNotEmpty(condition.getWosncode())){
+            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_WOSNID", condition.getWosncode()));
+            sqlMap.setParamValue("GPFKJG_WOSNID", condition.getWosncode());
+            
+        }
+        if (StringUtils.isNotEmpty(condition.getBzgxid())){
+            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_BZGXID", condition.getBzgxid()));
+            sqlMap.setParamValue("GPFKJG_BZGXID", condition.getBzgxid());
+            
+        }
+        if (StringUtils.isNotEmpty(condition.getWlid())){
+            sqlMap.append("  and " + SqlUtil.getWhereSql("GPFKJG_WLID", condition.getWlid()));
+            sqlMap.setParamValue("GPFKJG_WLID", condition.getWlid());
+            
+        }
+        sqlMap.execute();
+	}
+}

gavel/src/main/java/com/gavel/kwell/persistent/Gpfk.java

@@ -96,6 +96,17 @@ public class Gpfk extends BaseEntity {
 	@FieldMeta(fieldName = "GPFK_WLID", caption = "物料编码")
 	private String wlid;
 	
+	@FieldMeta(fieldName = "U_GPFK_BZGXID", caption = "标准工序ID")
+	private String bzgxid;
+	
+
+	public String getBzgxid() {
+		return bzgxid;
+	}
+
+	public void setBzgxid(String bzgxid) {
+		this.bzgxid = bzgxid;
+	}
 
 	public String getWogylx() {
 		return wogylx;

gavel/src/main/java/com/gavel/kwell/persistent/Gpfkjg.java

+package com.gavel.kwell.persistent;
+
+import java.util.Date;
+
+import com.gavel.common.base.entity.BaseEntity;
+import com.gavel.common.utils.CodeStrategy;
+import com.gavel.persistence.annotation.FieldMeta;
+import com.gavel.persistence.annotation.TableMeta;
+
+
+@TableMeta(id = "GPFKJG", name = "GPFKJG")
+public class Gpfkjg extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+   	@FieldMeta(fieldName = "GPFKJG_ID", caption = "ID", primaryKey = true,codeStrategy = CodeStrategy.UUID, notEmpty = true)
+	private String id;
+	@FieldMeta(fieldName = "GPFKJG_WOSNID", caption = "WOSN编码")
+	private String wosnid;
+	@FieldMeta(fieldName = "GPFKJG_FKSJ", caption = "反馈时间")
+	private Date fksj;
+	@FieldMeta(fieldName = "GPFKJG_FKJSSJ", caption = "反馈结束时间")
+	private Date fkjssj;
+	@FieldMeta(fieldName = "GPFKJG_HGBZ", caption = "合格标志")
+	private String hgbz;
+	@FieldMeta(fieldName = "GPFKJG_FKSL", caption = "反馈数量")
+	private Double fksl;
+	@FieldMeta(fieldName = "GPFKJG_HGSL", caption = "合格数量")
+	private Double hgsl;
+	@FieldMeta(fieldName = "GPFKJG_BHGSL", caption = "不合格数量")
+	private Double bhgsl;
+	@FieldMeta(fieldName = "GPFKJG_FKRID", caption = "反馈人编码")
+	private String fkrid;
+	@FieldMeta(fieldName = "GPFKJG_FKR", caption = "反馈人")
+	private String fkr;
+	@FieldMeta(fieldName = "GPFKJG_FKGX", caption = "反馈工序")
+	private String fkgx;
+	@FieldMeta(fieldName = "GPFKJG_FKBX", caption = "反馈班型")
+	private String fkbx;
+	@FieldMeta(fieldName = "GPFKJG_BZ", caption = "备注")
+	private String bz;
+	@FieldMeta(fieldName = "GPFKJG_WHRID", caption = "维护人编码", autoUserId = true)
+	private String whrid;
+	@FieldMeta(fieldName = "GPFKJG_WHR", caption = "维护人", autoUserName = true)
+	private String whr;
+	@FieldMeta(fieldName = "GPFKJG_WHSJ", caption = "维护时间", autoDateTime = true)
+	private Date whsj;
+	@FieldMeta(fieldName = "GPFKJG_CJRID", caption = "创建人编码", autoUserId = true, initial = true)
+	private String cjrid;
+	@FieldMeta(fieldName = "GPFKJG_CJR", caption = "创建人", autoUserName = true, initial = true)
+	private String cjr;
+	@FieldMeta(fieldName = "GPFKJG_CJSJ", caption = "创建时间", autoDateTime = true, initial = true)
+	private Date cjsj;
+	@FieldMeta(fieldName = "GPFKJG_SYSVERSION", caption = "系统版本")
+	private Integer sysversion;
+	@FieldMeta(fieldName = "GPFKJG_FKLX", caption = "反馈类型")
+	private String fklx;
+	@FieldMeta(fieldName = "GPFKJG_FXSL", caption = "返修数量")
+	private Double fxsl;
+	@FieldMeta(fieldName = "GPFKJG_GFSL", caption = "工废数量")
+	private Double gfsl;
+	@FieldMeta(fieldName = "GPFKJG_LFSL", caption = "料废数量")
+	private Double lfsl;
+	@FieldMeta(fieldName = "GPFKJG_FGSL", caption = "返工数量")
+	private Double fgsl;
+	@FieldMeta(fieldName = "GPFKJG_YKRKSL", caption = "已开入库单数量")
+	private Double ykrksl;
+	@FieldMeta(fieldName = "GPFKJG_FKPH", caption = "反馈批号")
+	private String fkph;
+	@FieldMeta(fieldName = "GPFKJG_SCHS", caption = "生产耗时")
+	private Double schs;
+	@FieldMeta(fieldName = "GPFKJG_TMHS", caption = "调模耗时")
+	private Double tmhs;
+	@FieldMeta(fieldName = "GPFKJG_XJHS", caption = "修机耗时")
+	private Double xjhs;
+	@FieldMeta(fieldName = "GPFKJG_QTHS", caption = "其他耗时")
+	private Double qths;
+	@FieldMeta(fieldName = "GPFKJG_FKSJD", caption = "反馈时间段")
+	private String fksjd;
+	@FieldMeta(fieldName = "GPFKJG_YWRQ", caption = "业务日期")
+	private Date ywrq;
+	@FieldMeta(fieldName = "GPFKJG_HGDJ", caption = "合格等级")
+	private String hgdj;
+	@FieldMeta(fieldName = "GPFKJG_WLID", caption = "物料编码")
+	private String wlid;
+	@FieldMeta(fieldName = "GPFKJG_BZGXID", caption = "标准工序编码")
+	private String bzgxid;
+	@FieldMeta(fieldName = "GPFKJG_WOGYLX", caption = "生产工艺路线")
+	private String wogylx;
+
+	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 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 getFkrid() {
+		return fkrid;
+	}	
+	public void setFkrid(String fkrid) {
+		this.fkrid = fkrid;
+	}
+	public String getFkr() {
+		return fkr;
+	}	
+	public void setFkr(String fkr) {
+		this.fkr = fkr;
+	}
+	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 getBzgxid() {
+		return bzgxid;
+	}	
+	public void setBzgxid(String bzgxid) {
+		this.bzgxid = bzgxid;
+	}
+	public String getWogylx() {
+		return wogylx;
+	}	
+	public void setWogylx(String wogylx) {
+		this.wogylx = wogylx;
+	}
+
+}
+
+
+
+
+
+

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

+package com.gavel.kwell.service;
+
+import com.gavel.common.base.service.BaseEditService;
+import com.gavel.persistence.sql.RecordSet;
+import com.gavel.kwell.persistent.Gpfkjg;
+import com.gavel.kwell.vo.GpfkjgCondition;
+import com.gavel.kwell.vo.GpfkjgVO;
+
+
+public interface GpfkjgService extends BaseEditService {
+	
+  public RecordSet<GpfkjgVO> query(GpfkjgCondition condition);
+    
+  public Gpfkjg queryEntityByCondition(GpfkjgCondition condition);
+  
+  public int queryIfContainsmdfkgx(GpfkjgCondition condition);
+  
+  public void deleteByCondition(GpfkjgCondition condition);
+}

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

+package com.gavel.kwell.service.impl;
+
+import com.gavel.common.base.service.impl.BaseEditServiceImpl;
+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 com.gavel.kwell.dao.GpfkjgDao;
+import com.gavel.kwell.persistent.Gpfkjg;
+import com.gavel.kwell.service.GpfkjgService;
+import com.gavel.kwell.vo.GpfkjgCondition;
+import com.gavel.kwell.vo.GpfkjgVO;
+
+
+@Service("gpfkjgService")
+@Transactional
+public class GpfkjgServiceImpl extends BaseEditServiceImpl implements GpfkjgService {
+
+    @Autowired
+    private GpfkjgDao gpfkjgDao;
+
+    @Override
+    public void initService() {
+        addMaster(Gpfkjg.class);
+    }
+
+    @Override
+	public RecordSet<GpfkjgVO> query(GpfkjgCondition condition) {
+	    return gpfkjgDao.query(condition);
+	}
+
+	@Override
+	public Gpfkjg queryEntityByCondition(GpfkjgCondition condition) {
+		// TODO Auto-generated method stub
+		return gpfkjgDao.queryEntityByCondition(condition);
+	}
+
+	@Override
+	public int queryIfContainsmdfkgx(GpfkjgCondition condition) {
+		// TODO Auto-generated method stub
+		return gpfkjgDao.queryIfContainsmdfkgx(condition);
+	}
+
+	@Override
+	public void deleteByCondition(GpfkjgCondition condition) {
+		// TODO Auto-generated method stub
+		gpfkjgDao.deleteByCondition(condition);
+	}
+
+}

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

@@ -91,7 +91,8 @@ public class FkVO extends BaseEntity {
 
 	@FieldMeta(fieldName = "GPFK_HGDJ", caption = "合格等级")
 	private String hgdj;
-
+	@FieldMeta(fieldName = "U_GPFK_BZGXID", caption = "标准工序")
+	private String wxbzgx;
 	@FieldMeta(fieldName = "WLXX_ID", caption = "物料编码")
 	private String wlid;
 	@FieldMeta(fieldName = "BX_CODE", caption = "班型编码")
@@ -615,6 +616,14 @@ public class FkVO extends BaseEntity {
 	public Double getQths() {
 		return qths;
 	}
+	
+	public String getWxbzgx() {
+		return wxbzgx;
+	}
+
+	public void setWxbzgx(String wxbzgx) {
+		this.wxbzgx = wxbzgx;
+	}
 
 	public void setQths(Double qths) {
 		this.qths = qths;

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

+package com.gavel.kwell.vo;
+
+import com.gavel.common.base.entity.BaseEntity;
+
+
+public class GpfkjgCondition extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+	
+    
+	private String id;
+	private String wlid;
+	private String bzgxid;
+	private String wosncode;
+
+	public String getWlid() {
+		return wlid;
+	}
+	public void setWlid(String wlid) {
+		this.wlid = wlid;
+	}
+	public String getBzgxid() {
+		return bzgxid;
+	}
+	public void setBzgxid(String bzgxid) {
+		this.bzgxid = bzgxid;
+	}
+	public String getWosncode() {
+		return wosncode;
+	}
+	public void setWosncode(String wosncode) {
+		this.wosncode = wosncode;
+	}
+	public String getId() {
+		return id;
+	}	
+	public void setId(String id) {
+		this.id = id;
+	}
+
+}

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

+package com.gavel.kwell.vo;
+
+import com.gavel.kwell.persistent.Gpfkjg;
+
+
+
+public class GpfkjgVO extends Gpfkjg {
+
+	private static final long serialVersionUID = 1L;
+
+	/*---------AutoBegin-----------*/
+	/*---------AutoEnd-------------*/
+
+}

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

@@ -2,7 +2,9 @@ package com.gavel.kwell.vo;
 
 import java.io.Serializable;
 
-public class WlslItem implements Serializable {
+import com.gavel.common.base.entity.BaseEntity;
+
+public class WlslItem extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 	private String wlid;
 	private String wosncode;

gavel/src/main/resources/jdbc.properties

 # erp测试环境
 jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-jdbc.url = jdbc:mysql://192.168.30.254:3306/kewll2?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+jdbc.url = jdbc:mysql://192.168.30.254:3306/kwell?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 jdbc.username = root
 jdbc.password = root
 
 
-