Commit 9ab2fe9d authored by zhoumaotao's avatar zhoumaotao

代码调整

parent b79c7987
...@@ -5,6 +5,7 @@ import com.gavel.common.base.controller.BaseController; ...@@ -5,6 +5,7 @@ import com.gavel.common.base.controller.BaseController;
import com.gavel.kwell.service.KmesBoardService; import com.gavel.kwell.service.KmesBoardService;
import com.gavel.kwell.vo.PsclVO; import com.gavel.kwell.vo.PsclVO;
import com.gavel.kwell.vo.SdclVO; import com.gavel.kwell.vo.SdclVO;
import com.gavel.kwell.vo.UWoVO;
import com.gavel.wo.persistent.Pcjhmx; import com.gavel.wo.persistent.Pcjhmx;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -90,5 +91,22 @@ public class KmesBoardController extends BaseController { ...@@ -90,5 +91,22 @@ public class KmesBoardController extends BaseController {
return buildReturnData(psclVO); return buildReturnData(psclVO);
} }
/**
*合格率
*/
/**
* 在制订单
*/
@RequestMapping(value = "queryWo", method = RequestMethod.POST)
@ResponseBody
public Object queryWo(@RequestBody JSONObject param) {
List<UWoVO> uWoVOS = kmesBoardService.queryWo();
return buildReturnData(uWoVOS);
}
/**
*生产进度跟踪
*/
} }
...@@ -3,6 +3,7 @@ package com.gavel.kwell.dao; ...@@ -3,6 +3,7 @@ package com.gavel.kwell.dao;
import com.gavel.common.base.dao.BaseDao; import com.gavel.common.base.dao.BaseDao;
import com.gavel.kwell.persistent.Wlsn; import com.gavel.kwell.persistent.Wlsn;
import com.gavel.kwell.vo.PsclVO; import com.gavel.kwell.vo.PsclVO;
import com.gavel.kwell.vo.UWoVO;
import com.gavel.kwell.vo.WlsnCondition; import com.gavel.kwell.vo.WlsnCondition;
import com.gavel.kwell.vo.WlsnVO; import com.gavel.kwell.vo.WlsnVO;
import com.gavel.persistence.sql.RecordSet; import com.gavel.persistence.sql.RecordSet;
...@@ -18,4 +19,6 @@ public interface KmesBoardDao extends BaseDao { ...@@ -18,4 +19,6 @@ public interface KmesBoardDao extends BaseDao {
public PsclVO queryTodayPcsl(); public PsclVO queryTodayPcsl();
public PsclVO queryMonthPcsl(); public PsclVO queryMonthPcsl();
public List<UWoVO> queryWo();
} }
...@@ -4,6 +4,7 @@ import com.gavel.common.base.dao.impl.BaseDaoImpl; ...@@ -4,6 +4,7 @@ import com.gavel.common.base.dao.impl.BaseDaoImpl;
import com.gavel.common.utils.DateUtils; import com.gavel.common.utils.DateUtils;
import com.gavel.kwell.dao.KmesBoardDao; import com.gavel.kwell.dao.KmesBoardDao;
import com.gavel.kwell.vo.PsclVO; import com.gavel.kwell.vo.PsclVO;
import com.gavel.kwell.vo.UWoVO;
import com.gavel.persistence.sql.SqlMap; import com.gavel.persistence.sql.SqlMap;
import com.gavel.wo.persistent.Pcjhmx; import com.gavel.wo.persistent.Pcjhmx;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -48,4 +49,18 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao { ...@@ -48,4 +49,18 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
sqlMap.setParamValue("jsrq", DateUtils.endOfMonth(DateUtils.getDateTime())); sqlMap.setParamValue("jsrq", DateUtils.endOfMonth(DateUtils.getDateTime()));
return sqlMap.queryEntity(PsclVO.class); return sqlMap.queryEntity(PsclVO.class);
} }
@Override
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("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("order by WO_YWRQ desc ");
return sqlMap.query(UWoVO.class);
}
} }
...@@ -3,6 +3,7 @@ package com.gavel.kwell.service; ...@@ -3,6 +3,7 @@ package com.gavel.kwell.service;
import com.gavel.common.base.service.BaseEditService; import com.gavel.common.base.service.BaseEditService;
import com.gavel.kwell.vo.PsclVO; import com.gavel.kwell.vo.PsclVO;
import com.gavel.kwell.vo.SdclVO; import com.gavel.kwell.vo.SdclVO;
import com.gavel.kwell.vo.UWoVO;
import com.gavel.wo.persistent.Pcjhmx; import com.gavel.wo.persistent.Pcjhmx;
import java.util.List; import java.util.List;
...@@ -17,4 +18,6 @@ public interface KmesBoardService extends BaseEditService { ...@@ -17,4 +18,6 @@ public interface KmesBoardService extends BaseEditService {
public PsclVO queryTodayPcsl(); public PsclVO queryTodayPcsl();
public PsclVO queryMonthPcsl(); public PsclVO queryMonthPcsl();
public List<UWoVO> queryWo();
} }
...@@ -13,10 +13,7 @@ import com.gavel.kwell.service.KmesBoardService; ...@@ -13,10 +13,7 @@ import com.gavel.kwell.service.KmesBoardService;
import com.gavel.kwell.service.WlsnService; import com.gavel.kwell.service.WlsnService;
import com.gavel.kwell.utils.DateCalculateUtil; import com.gavel.kwell.utils.DateCalculateUtil;
import com.gavel.kwell.utils.WlsnLxEnum; import com.gavel.kwell.utils.WlsnLxEnum;
import com.gavel.kwell.vo.PsclVO; import com.gavel.kwell.vo.*;
import com.gavel.kwell.vo.SdclVO;
import com.gavel.kwell.vo.WlsnCondition;
import com.gavel.kwell.vo.WlsnVO;
import com.gavel.persistence.sql.RecordSet; import com.gavel.persistence.sql.RecordSet;
import com.gavel.wo.persistent.Pcjhmx; import com.gavel.wo.persistent.Pcjhmx;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -89,4 +86,10 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa ...@@ -89,4 +86,10 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
public PsclVO queryMonthPcsl() { public PsclVO queryMonthPcsl() {
return kmesBoardDao.queryMonthPcsl(); return kmesBoardDao.queryMonthPcsl();
} }
@Override
public List<UWoVO> queryWo() {
return kmesBoardDao.queryWo();
}
} }
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