Commit a96b522f authored by yff's avatar yff

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

parents ac340214 4130e0e4
......@@ -97,7 +97,7 @@ public class KmesBoardController extends BaseController {
/**
* 在制订单
* 生产进度跟踪
*/
@RequestMapping(value = "queryWo", method = RequestMethod.POST)
@ResponseBody
......@@ -107,6 +107,13 @@ public class KmesBoardController extends BaseController {
}
/**
*生产进度跟踪
*在制订单
*/
@RequestMapping(value = "queryWorkingWO", method = RequestMethod.POST)
@ResponseBody
public Object queryWorkingWO(@RequestBody JSONObject param) {
UWoVO uWoVO = kmesBoardService.queryWorkingWO();
return buildReturnData(uWoVO);
}
}
......@@ -21,4 +21,6 @@ public interface KmesBoardDao extends BaseDao {
public PsclVO queryMonthPcsl();
public List<UWoVO> queryWo();
public UWoVO queryWorkingWO();
}
......@@ -117,10 +117,10 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select GPFK_ID, GPFK_WOSNID, GPFK_FKLX, GPFK_FKGX, ");
sqlMap.append(" GPFK_FKSJ,GPFK_FKR,GPFK_FKRID, GPFK_FKBX, GPFK_FKJSSJ,");
sqlMap.append(" GPFK_HGBZ,GPFK_FKSL,GPFK_HGSL,GPFK_BHGSL,GPFK_GFSL, ");
sqlMap.append(" GPFK_HGBZ,GPFK_FKSL,GPFK_HGSL,GPFK_BHGSL,GPFK_GFSL,GPFK_WOGYLX, ");
sqlMap.append(" GPFK_LFSL,WOGYLX_GXBZ ");
sqlMap.append("from GPFK ");
sqlMap.append(" left join wogylx on wogylx_id = gpfk_fkgx ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX ");
sqlMap.append("where (GPFK_FKSJ >= :pStart and GPFK_FKSJ < :pEnd) and WOGYLX_GXBZ = :pGxbz ");//[a,b)
sqlMap.setParamValue("pStart", start);
sqlMap.setParamValue("pEnd", end);
......
package com.gavel.kwell.dao.impl;
import com.gavel.bom.utils.GxlxGxbzEnum;
import com.gavel.common.base.dao.impl.BaseDaoImpl;
import com.gavel.common.utils.DateUtils;
import com.gavel.kwell.dao.KmesBoardDao;
......@@ -54,13 +55,30 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
public List<UWoVO> queryWo() {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select WO_ID,WO_DJID,WO_GCID,WO_YWRQ,WO_WLID,WO_XQSL,WO_WGSL, ");
sqlMap.append(" A.PCJHMX_JHSL as WO_PCSL,WLXX_CODE,WLXX_NAME,WLXX_GG ");
sqlMap.append(" isnull(A.PCJHMX_JHSL,0) as WO_PCSL,WLXX_CODE,WLXX_NAME,WLXX_GG ");
sqlMap.append("from WO ");
sqlMap.append(" left join (select PCJHMX_WOID,sum(PCJHMX_JHSL) as PCJHMX_JHSL ");
sqlMap.append(" from PCJHMX group by PCJHMX_WOID) A on A.PCJHMX_WOID = WO_ID ");
sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID ");
sqlMap.append("where WO_WGSL - WO_XQSL < 0 ");
sqlMap.append("where abs(WO_WGSL) - abs(WO_XQSL) < 0 ");
sqlMap.append("order by WO_YWRQ desc,WO_DJID desc ");
return sqlMap.query(UWoVO.class);
}
@Override
public UWoVO queryWorkingWO() {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select WO_DJID,WO_GCID,WO_YWRQ,WO_WLID,WO_XQSL,WO_WGSL,WLXX_CODE,WLXX_NAME,WLXX_GG ");
sqlMap.append("from GPFK ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX ");
sqlMap.append(" left join WO on WO_ID = WOGYLX_WOID ");
sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID ");
sqlMap.append("where 1=1 and GPFK_CJSJ = (select max(GPFK_CJSJ) ");
sqlMap.append(" from GPFK ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX ");
sqlMap.append(" where WOGYLX_GXBZ = :pGxbz ");
sqlMap.setParamValue("pGxbz", GxlxGxbzEnum.FIRST.getId());
sqlMap.append(" ) ");
return sqlMap.queryEntity(UWoVO.class);
}
}
......@@ -20,4 +20,6 @@ public interface KmesBoardService extends BaseEditService {
public PsclVO queryMonthPcsl();
public List<UWoVO> queryWo();
public UWoVO queryWorkingWO();
}
......@@ -92,4 +92,9 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
public List<UWoVO> queryWo() {
return kmesBoardDao.queryWo();
}
@Override
public UWoVO queryWorkingWO() {
return kmesBoardDao.queryWorkingWO();
}
}
......@@ -9,8 +9,8 @@ import java.util.List;
@GavelParams("901000000")
public enum KwellParamEnum {
DASHBORAD_PDF("PDF", "大屏看板PDF文件路径", "S", "大屏看板PDF文件路径", "S", "", "", ""),
DASHBORAD_VIDEO("VIDEO","大屏看板视频路径" ,"S","大屏看板视频路径","S","","","");
DASHBORAD_PDF("PDF", "配置大屏看板PDF文件路径", "S", "配置大屏看板PDF文件路径", "S", "", "D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\pdf\\dashboard.pdf", ""),
DASHBORAD_VIDEO("VIDEO","配置大屏看板视频路径" ,"S","配置大屏看板视频路径","S","","D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4","");
private String id; // 参数ID
private String name; //参数名称
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment