Skip to content

K
kwell-mes
Commit 615b96c0 authored by 周毅's avatar 周毅
Browse files
Options

调整代码

parent 1557f5ac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 1200 deletions
gavel/pom.xml
View file @ 615b96c0
...@@ -140,30 +140,6 @@ ...@@ -140,30 +140,6 @@
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.gavel.erp</groupId>
<artifactId>gavel-kc</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.gavel.erp</groupId>
<artifactId>gavel-cggl</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.gavel.erp</groupId>
<artifactId>gavel-cgjs</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.gavel.erp</groupId>
<artifactId>gavel-chhs</artifactId>
<version>1.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.gavel.erp</groupId> <groupId>com.gavel.erp</groupId>
<artifactId>gavel-bom</artifactId> <artifactId>gavel-bom</artifactId>
...@@ -176,48 +152,18 @@ ...@@ -176,48 +152,18 @@
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.gavel.erp</groupId>
<artifactId>gavel-zlgl</artifactId>
<version>1.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.gavel.erp</groupId> <groupId>com.gavel.erp</groupId>
<artifactId>gavel-wo</artifactId> <artifactId>gavel-wo</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.gavel.erp</groupId>
<artifactId>gavel-jit</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.gavel.erp</groupId>
<artifactId>gavel-xs</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.gavel.erp</groupId>
<artifactId>gavel-xsjs</artifactId>
<version>1.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.gavel.erp</groupId> <groupId>com.gavel.erp</groupId>
<artifactId>gavel-cjzy</artifactId> <artifactId>gavel-cjzy</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>gavel-local</groupId>
<artifactId>access-core</artifactId>
<version>1.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
......
gavel/src/main/java/com/gavel/kwell/controller/GpwxController.java
View file @ 615b96c0
package com.gavel.kwell.controller; package com.gavel.kwell.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -24,9 +22,6 @@ import com.gavel.kwell.service.GpfkService; ...@@ -24,9 +22,6 @@ import com.gavel.kwell.service.GpfkService;
import com.gavel.kwell.vo.GpfkCondition; import com.gavel.kwell.vo.GpfkCondition;
import com.gavel.kwell.vo.GpfkVO; import com.gavel.kwell.vo.GpfkVO;
import com.gavel.persistence.sql.RecordSet; import com.gavel.persistence.sql.RecordSet;
import com.gavel.zlgl.vo.JydmxVO;
import io.swagger.annotations.ApiOperation;
@Controller @Controller
@RequestMapping("kmes/gpwx") @RequestMapping("kmes/gpwx")
...@@ -80,21 +75,6 @@ public class GpwxController extends BaseController { ...@@ -80,21 +75,6 @@ public class GpwxController extends BaseController {
doExport(request, response, param, records.getRecords()); doExport(request, response, param, records.getRecords());
} }
@ApiOperation(value = "查询条码对应的不合格检验信息，传入wosnid")
@RequestMapping(value = "/getBhgJymx", method = RequestMethod.POST)
@ResponseBody
public Object getGphymx(@RequestBody JSONObject param) {
String wosnid = param.getString("wosnid");
if(StringUtils.isEmpty(wosnid)){
setReturnMessage("条码信息不允许为空！");
return returnData();
}
List<JydmxVO> jydmxVOList = gpfkService.queryBhgJydmxBySnid(wosnid);
return buildReturnData(jydmxVOList, JydmxVO.class);
}
@ResourcePermissions({"21"}) @ResourcePermissions({"21"})
@RequestMapping(value = "/delGpwx", method = RequestMethod.POST) @RequestMapping(value = "/delGpwx", method = RequestMethod.POST)
@ResponseBody @ResponseBody
......
gavel/src/main/java/com/gavel/kwell/dao/GpfkDao.java
View file @ 615b96c0
...@@ -19,12 +19,6 @@ import com.gavel.kwell.vo.GpwxmxVO; ...@@ -19,12 +19,6 @@ import com.gavel.kwell.vo.GpwxmxVO;
import com.gavel.kwell.vo.HzWoVO; import com.gavel.kwell.vo.HzWoVO;
import com.gavel.persistence.sql.RecordSet; import com.gavel.persistence.sql.RecordSet;
import com.gavel.wo.vo.WogylxVO; import com.gavel.wo.vo.WogylxVO;
import com.gavel.zlgl.persistent.Bhgmx;
import com.gavel.zlgl.persistent.Jyd;
import com.gavel.zlgl.persistent.Jydmx;
import com.gavel.zlgl.vo.JydVO;
import com.gavel.zlgl.vo.JydmxVO;
import com.gavel.zlgl.vo.JygcVO;
public interface GpfkDao extends BaseDao { public interface GpfkDao extends BaseDao {
...@@ -35,8 +29,6 @@ public interface GpfkDao extends BaseDao { ...@@ -35,8 +29,6 @@ public interface GpfkDao extends BaseDao {
public HzWoVO queryWoBySnid(String snid); public HzWoVO queryWoBySnid(String snid);
public List<JygcVO> getJygc(String wlid, String gxid, String xtjylx);
public List<Gpfk> queryExistGpfk(String wosnid, String gxid); public List<Gpfk> queryExistGpfk(String wosnid, String gxid);
public List<GpbhgmxVO> queryWosnGpbhg(String wosnid); public List<GpbhgmxVO> queryWosnGpbhg(String wosnid);
...@@ -55,10 +47,6 @@ public interface GpfkDao extends BaseDao { ...@@ -55,10 +47,6 @@ public interface GpfkDao extends BaseDao {
public GpfkVO queryZyjhGpfkVOByGpid(String gpfkid); public GpfkVO queryZyjhGpfkVOByGpid(String gpfkid);
public JydVO queryJydVOByGpid(String gpfkid);
public List<JydmxVO> queryJydmxVOByJydid(String jydid);
public Gpfk getLastExistBhgGpfk(String wosnid, Date endtime); public Gpfk getLastExistBhgGpfk(String wosnid, Date endtime);
public List<GpwxmxVO> queryGpbhgmxVOByGpid(String gpfkid); public List<GpwxmxVO> queryGpbhgmxVOByGpid(String gpfkid);
...@@ -69,14 +57,6 @@ public interface GpfkDao extends BaseDao { ...@@ -69,14 +57,6 @@ public interface GpfkDao extends BaseDao {
public List<Gpwxmx> queryGpwxmxByGpid(String gpfkid); public List<Gpwxmx> queryGpwxmxByGpid(String gpfkid);
public Jyd queryJydByGpid(String gpfkid);
public List<Jydmx> queryJydmxByJydid(String jydid);
public List<Bhgmx> queryBhgmxListByJydid(String jydid);
public List<JydmxVO> queryJydmxVOBySnid(String snid, String hgbz);
public Bzgx getLastGx(Bzgx bzgx); public Bzgx getLastGx(Bzgx bzgx);
public Bzgx getNextGx(Bzgx bzgx); public Bzgx getNextGx(Bzgx bzgx);
......
gavel/src/main/java/com/gavel/kwell/dao/HzWlxxDao.java deleted 100644 → 0
View file @ 1557f5ac
package com.gavel.kwell.dao;
import com.gavel.jcsj.dao.WlxxDao;
import com.gavel.jcsj.vo.WlxxCondition;
import com.gavel.jcsj.vo.WlxxVO;
import com.gavel.persistence.sql.RecordSet;
public interface HzWlxxDao extends WlxxDao {
public RecordSet<WlxxVO> query(WlxxCondition condition);
public RecordSet<WlxxVO> queryWlxxCskc(WlxxCondition condition);
public RecordSet<WlxxVO> queryWowl(WlxxCondition condition);
}
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ 615b96c0
...@@ -30,13 +30,6 @@ import com.gavel.persistence.sql.RecordSet; ...@@ -30,13 +30,6 @@ import com.gavel.persistence.sql.RecordSet;
import com.gavel.persistence.sql.SqlMap; import com.gavel.persistence.sql.SqlMap;
import com.gavel.persistence.sql.SqlUtil; import com.gavel.persistence.sql.SqlUtil;
import com.gavel.wo.vo.WogylxVO; import com.gavel.wo.vo.WogylxVO;
import com.gavel.zlgl.persistent.Bhgmx;
import com.gavel.zlgl.persistent.Jyd;
import com.gavel.zlgl.persistent.Jydmx;
import com.gavel.zlgl.utils.JydDjlyEnum;
import com.gavel.zlgl.vo.JydVO;
import com.gavel.zlgl.vo.JydmxVO;
import com.gavel.zlgl.vo.JygcVO;
@Repository("gpfkDao") @Repository("gpfkDao")
...@@ -250,40 +243,6 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -250,40 +243,6 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
return sqlMap.queryEntity(HzWoVO.class); return sqlMap.queryEntity(HzWoVO.class);
} }
@Override
public List<JygcVO> getJygc(String wlid, String gxid, String xtjylx){
SqlMap sqlMap = new SqlMap();
sqlMap.append("select JYGC_ID, JYGC_CODE, JYGC_NAME, JYGC_JYLXID, JYGC_JYBZID, ");
sqlMap.append(" JYGC_WLID, JYGC_KZFS, JYGC_YGD, JYGC_TYBZ, JYGC_TYSJ, ");
sqlMap.append(" JYGC_BZGXID, JYGC_JYYID ");
sqlMap.append("from( ");
sqlMap.append(" select JYGC_ID, JYGC_CODE, JYGC_NAME, JYGC_JYLXID, JYGC_JYBZID, ");
sqlMap.append(" JYGC_WLID, JYGC_KZFS, JYGC_YGD, JYGC_TYBZ, JYGC_TYSJ, ");
sqlMap.append(" JYGC_BZGXID, JYGC_JYYID, 1 as PX ");
sqlMap.append(" from JYGC ");
sqlMap.append(" left join JYLX on JYLX_ID = JYGC_JYLXID ");
sqlMap.append(" where 1 = 1 ");
sqlMap.append(" and JYLX_XTJYLXID = :pJYLX and JYGC_WLID = :pWLID ");
sqlMap.append(" and isnull(JYGC_BZGXID,' ') = :pGXID ");
sqlMap.append(" and isnull(JYGC_TYBZ,'N') = 'N' ");
sqlMap.append(" union all ");
sqlMap.append(" select JYGC_ID, JYGC_CODE, JYGC_NAME, JYGC_JYLXID, JYGC_JYBZID, ");
sqlMap.append(" JYGC_WLID, JYGC_KZFS, JYGC_YGD, JYGC_TYBZ, JYGC_TYSJ, ");
sqlMap.append(" JYGC_BZGXID, JYGC_JYYID, 2 as PX ");
sqlMap.append(" from JYGC ");
sqlMap.append(" left join JYLX on JYLX_ID = JYGC_JYLXID ");
sqlMap.append(" where 1 = 1 ");
sqlMap.append(" and JYLX_XTJYLXID = :pJYLX and JYGC_WLID = :pWLID ");
sqlMap.append(" and isnull(JYGC_BZGXID,' ') = ' ' ");
sqlMap.append(" and isnull(JYGC_TYBZ,'N') = 'N' ");
sqlMap.append(")A ");
sqlMap.append("order by PX ");
sqlMap.setParamValue("pJYLX",xtjylx);
sqlMap.setParamValue("pWLID",wlid);
sqlMap.setParamValue("pGXID",gxid);
return sqlMap.query(JygcVO.class);
}
@Override @Override
public List<Gpfk> queryExistGpfk(String wosnid, String gxid){ public List<Gpfk> queryExistGpfk(String wosnid, String gxid){
SqlMap sqlMap = new SqlMap(); SqlMap sqlMap = new SqlMap();
...@@ -765,53 +724,6 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -765,53 +724,6 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
return sqlMap.queryEntity(GpfkVO.class); return sqlMap.queryEntity(GpfkVO.class);
} }
@Override
public JydVO queryJydVOByGpid(String gpfkid) {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select JYD_ID, JYD_DJID, JYD_JYLXID, JYD_DJLY, JYD_WLID, ");
sqlMap.append(" JYD_BZGXID, JYD_KHID, JYD_JYBZID, JYD_JYFS, JYD_CYFS, ");
sqlMap.append(" JYD_JYPH, JYD_JYRID, JYD_JYRQ, JYD_JYBMID, JYD_JYSL, ");
sqlMap.append(" JYD_JYMS, JYD_YWBMID, JYD_HG, JYD_HGSL, JYD_RBSJSL, ");
sqlMap.append(" JYD_BFSL, JYD_THSL, JYD_QTSL, JYD_ZT, JYD_BZ, ");
sqlMap.append(" JYD_WFID, JYD_WFINSTID, JYD_WFPID, JYD_WFPNAME, JYD_WFWUSERID, ");
sqlMap.append(" JYD_WFWUSERNAME, JYD_WFHUSERID, JYD_WFHUSERNAME, JYD_WHRID, JYD_WHR, ");
sqlMap.append(" JYD_WHSJ, JYD_CJRID, JYD_CJR, JYD_CJSJ, JYD_SYSVERSION, JYD_BHGSL, ");
sqlMap.append(" JYLX_NAME, WLXX_CODE,WLXX_NAME,BZGX_NAME,JYBZ_NAME,JYD_LYDJID, ");
sqlMap.append(" JY.BM_NAME as JYBM_NAME,YW.BM_NAME as YWBM_NAME,KH_NAME,USERS_USERNAME ");
sqlMap.append("from JYD ");
sqlMap.append(" left join JYLX on JYLX_ID = JYD_JYLXID ");
sqlMap.append(" left join WLXX on WLXX_ID = JYD_WLID ");
sqlMap.append(" left join BZGX on BZGX_ID = JYD_BZGXID ");
sqlMap.append(" left join KH on KH_ID = JYD_KHID ");
sqlMap.append(" left join JYBZ on JYBZ_ID = JYD_JYBZID ");
sqlMap.append(" left join BM JY on JY.BM_ID = JYD_JYBMID ");
sqlMap.append(" left join BM YW on YW.BM_ID = JYD_YWBMID ");
sqlMap.append(" left join USERS on USERS_USERID = JYD_JYRID ");
sqlMap.append("where 1 = 1 ");
sqlMap.append(" and JYD_LYDJID = :pGPFKID ");
sqlMap.append(" and JYD_DJLY = :pDJLY ");
sqlMap.setParamValue("pGPFKID", gpfkid);
sqlMap.setParamValue("pDJLY", JydDjlyEnum.GX.getId());
return sqlMap.queryEntity(JydVO.class);
}
@Override
public List<JydmxVO> queryJydmxVOByJydid(String jydid){
SqlMap sqlMap = new SqlMap();
sqlMap.append("select JYDMX_ID, JYDMX_MID, JYDMX_XH, JYDMX_JYXMID, JYDMX_ZYJB, ");
sqlMap.append(" JYDMX_ZLX, JYDMX_JYFS, JYDMX_CYFS, JYDMX_KZFS, JYDMX_YBSL, ");
sqlMap.append(" JYDMX_HGSL, JYDMX_SXZ, JYDMX_XXZ, JYDMX_BZZ, JYDMX_JYZ, ");
sqlMap.append(" JYDMX_HG, JYDMX_BZ, JYDMX_WHRID, JYDMX_WHR, JYDMX_WHSJ, ");
sqlMap.append(" JYDMX_CJRID, JYDMX_CJR, JYDMX_CJSJ, JYDMX_SYSVERSION, JYDMX_BHGSL,");
sqlMap.append(" JYXM_CODE, JYXM_NAME,JYXM_ZYJB ");
sqlMap.append("from JYDMX ");
sqlMap.append(" left join JYXM on JYXM_ID = JYDMX_JYXMID ");
sqlMap.append("where 1 = 1 ");
sqlMap.append(" and JYDMX_MID = :pMID ");
sqlMap.setParamValue("pMID",jydid);
return sqlMap.query(JydmxVO.class);
}
@Override @Override
public List<GpwxmxVO> queryGpbhgmxVOByGpid(String gpfkid){ public List<GpwxmxVO> queryGpbhgmxVOByGpid(String gpfkid){
SqlMap sqlMap = new SqlMap(); SqlMap sqlMap = new SqlMap();
...@@ -865,74 +777,6 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -865,74 +777,6 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
return sqlMap.query(Gpwxmx.class); return sqlMap.query(Gpwxmx.class);
} }
@Override
public Jyd queryJydByGpid(String gpfkid) {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select JYD_ID, JYD_DJID, JYD_JYLXID, JYD_DJLY, JYD_WLID, ");
sqlMap.append(" JYD_BZGXID, JYD_KHID, JYD_JYBZID, JYD_JYFS, JYD_CYFS, ");
sqlMap.append(" JYD_JYPH, JYD_JYRID, JYD_JYRQ, JYD_JYBMID, JYD_JYSL, ");
sqlMap.append(" JYD_JYMS, JYD_YWBMID, JYD_HG, JYD_HGSL, JYD_RBSJSL, ");
sqlMap.append(" JYD_BFSL, JYD_THSL, JYD_QTSL, JYD_ZT, JYD_BZ ");
sqlMap.append("from JYD ");
sqlMap.append("where 1 = 1 ");
sqlMap.append(" and JYD_LYDJID = :pGPFKID ");
sqlMap.append(" and JYD_DJLY = :pDJLY ");
sqlMap.setParamValue("pGPFKID", gpfkid);
sqlMap.setParamValue("pDJLY", JydDjlyEnum.GX.getId());
return sqlMap.queryEntity(Jyd.class);
}
@Override
public List<Jydmx> queryJydmxByJydid(String jydid){
SqlMap sqlMap = new SqlMap();
sqlMap.append("select JYDMX_ID, JYDMX_MID, JYDMX_XH, JYDMX_JYXMID, JYDMX_ZYJB, ");
sqlMap.append(" JYDMX_ZLX, JYDMX_JYFS, JYDMX_CYFS, JYDMX_KZFS, JYDMX_YBSL, ");
sqlMap.append(" JYDMX_HGSL, JYDMX_SXZ, JYDMX_XXZ, JYDMX_BZZ, JYDMX_JYZ, ");
sqlMap.append(" JYDMX_HG, JYDMX_BZ, JYDMX_WHRID, JYDMX_WHR, JYDMX_WHSJ ");
sqlMap.append("from JYDMX ");
sqlMap.append("where 1 = 1 ");
sqlMap.append(" and JYDMX_MID = :pMID ");
sqlMap.setParamValue("pMID",jydid);
return sqlMap.query(Jydmx.class);
}
@Override
public List<Bhgmx> queryBhgmxListByJydid(String jydid) {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select BHGMX_ID, BHGMX_MID, BHGMX_XXID, BHGMX_YYID, BHGMX_BHGSL, ");
sqlMap.append(" BHGMX_BZ, BHGMX_WHRID, BHGMX_WHR, BHGMX_WHSJ, BHGMX_CJRID, ");
sqlMap.append(" BHGMX_CJR, BHGMX_CJSJ, BHGMX_SYSVERSION ");
sqlMap.append("from BHGMX ");
sqlMap.append("where 1 = 1 ");
sqlMap.append(" and BHGMX_MID = :pMID ");
sqlMap.setParamValue("pMID",jydid);
return sqlMap.query(Bhgmx.class);
}
@Override
public List<JydmxVO> queryJydmxVOBySnid(String snid, String hgbz){
SqlMap sqlMap = new SqlMap();
sqlMap.append("select JYDMX_ID, JYDMX_MID, JYDMX_XH, JYDMX_JYXMID, JYDMX_ZYJB, ");
sqlMap.append(" JYDMX_ZLX, JYDMX_JYFS, JYDMX_CYFS, JYDMX_KZFS, JYDMX_YBSL, ");
sqlMap.append(" JYDMX_HGSL, JYDMX_SXZ, JYDMX_XXZ, JYDMX_BZZ, JYDMX_JYZ, ");
sqlMap.append(" JYDMX_HG, JYDMX_BZ, JYDMX_WHRID, JYDMX_WHR, JYDMX_WHSJ, ");
sqlMap.append(" JYDMX_CJRID, JYDMX_CJR, JYDMX_CJSJ, JYDMX_SYSVERSION, JYDMX_BHGSL,");
sqlMap.append(" JYXM_CODE, JYXM_NAME, JYXM_ZYJB ");
sqlMap.append("from JYDMX ");
sqlMap.append(" left join JYXM on JYXM_ID = JYDMX_JYXMID ");
sqlMap.append(" left join JYD on JYD_ID = JYDMX_MID and JYD_DJLY = :pDJLY ");
sqlMap.append(" left join GPFK on GPFK_ID = JYD_LYDJID ");
sqlMap.append("where 1 = 1 ");
sqlMap.append(" and GPFK_WOSNID = :pSNID ");
if(StringUtils.isNotEmpty(hgbz)){
sqlMap.append("and JYDMX_HG = :pHG ");
sqlMap.setParamValue("pHG",hgbz);
}
sqlMap.setParamValue("pDJLY",JydDjlyEnum.GX.getId());
sqlMap.setParamValue("pSNID",snid);
return sqlMap.query(JydmxVO.class);
}
@Override @Override
public Bzgx getLastGx(Bzgx bzgx){ public Bzgx getLastGx(Bzgx bzgx){
SqlMap sqlMap = new SqlMap(); SqlMap sqlMap = new SqlMap();
......
gavel/src/main/java/com/gavel/kwell/service/GpfkService.java
View file @ 615b96c0
...@@ -14,9 +14,7 @@ import com.gavel.kwell.vo.GpbhgmxVO; ...@@ -14,9 +14,7 @@ import com.gavel.kwell.vo.GpbhgmxVO;
import com.gavel.kwell.vo.GpfkCondition; import com.gavel.kwell.vo.GpfkCondition;
import com.gavel.kwell.vo.GpfkVO; import com.gavel.kwell.vo.GpfkVO;
import com.gavel.kwell.vo.HzWoVO; import com.gavel.kwell.vo.HzWoVO;
import com.gavel.kzzx.model.GavelEnumModel;
import com.gavel.persistence.sql.RecordSet; import com.gavel.persistence.sql.RecordSet;
import com.gavel.zlgl.vo.JydmxVO;
public interface GpfkService extends BaseEditService { public interface GpfkService extends BaseEditService {
...@@ -70,16 +68,8 @@ public interface GpfkService extends BaseEditService { ...@@ -70,16 +68,8 @@ public interface GpfkService extends BaseEditService {
public void delGpwxById(String gpfkid); public void delGpwxById(String gpfkid);
public void delGpjyById(String gpfkid);
public List<JydmxVO> queryBhgJydmxBySnid(String snid);
public GpfkVO getDailyGpfkInfo(GpfkCondition gpfkCondition); public GpfkVO getDailyGpfkInfo(GpfkCondition gpfkCondition);
public void delZyjhGpfk(String gpfkid);
public List<GavelEnumModel> getBxPeriod(String bxid);
public RecordSet<GpfkVO> queryLh(GpfkCondition condition); public RecordSet<GpfkVO> queryLh(GpfkCondition condition);
public Date getGpfkYwrqByFksj(Date nowDate); public Date getGpfkYwrqByFksj(Date nowDate);
......
gavel/src/main/java/com/gavel/kwell/service/impl/HzWlxxServiceImpl.java deleted 100644 → 0
View file @ 1557f5ac
package com.gavel.kwell.service.impl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.gavel.common.Constants;
import com.gavel.common.base.entity.BaseEntity;
import com.gavel.common.utils.BooleanEnum;
import com.gavel.common.utils.StringUtils;
import com.gavel.jcsj.persistent.Wlfl;
import com.gavel.jcsj.persistent.Wlxx;
import com.gavel.jcsj.service.impl.WlxxServiceImpl;
import com.gavel.jcsj.vo.WlxxCondition;
import com.gavel.jcsj.vo.WlxxVO;
import com.gavel.kwell.dao.HzWlxxDao;
import com.gavel.kwell.service.HzWlxxService;
import com.gavel.persistence.sql.RecordSet;
/*
* @Author youjian.ding
* @Date $
**/
@Service("hzWlxxService")
@Transactional
public class HzWlxxServiceImpl extends WlxxServiceImpl implements HzWlxxService {
@Autowired
HzWlxxDao hzWlxxDao;
@Override
public RecordSet<WlxxVO> queryWowl(WlxxCondition condition){
if (StringUtils.equalsIgnoreCase(condition.getFlbm(), Constants.TREE_ROOT)) {
condition.setFlcjid("");
}else {
Wlfl wlfl = hzWlxxDao.queryById(Wlfl.class, condition.getFlbm());
if (wlfl == null)
condition.setFlcjid("");
else
condition.setFlcjid(wlfl.getCjid());
}
return hzWlxxDao.queryWowl(condition);
}
@Override
public RecordSet<WlxxVO> queryWlxxCskc(WlxxCondition condition) {
if (StringUtils.equalsIgnoreCase(condition.getFlbm(), Constants.TREE_ROOT)) {
condition.setFlcjid("");
}else {
Wlfl wlfl = hzWlxxDao.queryById(Wlfl.class, condition.getFlbm());
if (wlfl == null)
condition.setFlcjid("");
else
condition.setFlcjid(wlfl.getCjid());
}
condition.setDjgl(BooleanEnum.NO.getId());
return hzWlxxDao.queryWlxxCskc(condition);
}
@Override
public boolean postValid(BaseEntity entity){
if(entity!=null && entity instanceof Wlxx){
Wlxx wlxx = (Wlxx) entity;
//更新记录
if (wlxx.dataState() == BaseEntity.DataState.UPDATE) {
Wlxx wlxxOld = hzWlxxDao.queryById(Wlxx.class, wlxx.getId());
if (wlxxOld == null) {
setReturnMessage("数据发生变化！");
return false;
}
//编码改变时
if (!wlxx.getCode().equals(wlxxOld.getCode())) {
if (hzWlxxDao.wlidIsUsed(wlxxOld.getCode())) {
setReturnMessage("原物料编码"+ wlxxOld.getCode() +"已被使用，不允许修改！");
return false;
}
}
}
}
return true;
}
@Override
public boolean canDelete(BaseEntity entity){
if(entity!=null && entity instanceof Wlxx){
Wlxx wlxx = (Wlxx) entity;
if (hzWlxxDao.wlidIsUsed(wlxx.getCode())) {
setReturnMessage("物料编码已被使用，不允许删除！");
return false;
}
}
return true;
}
}
gavel/src/main/java/com/gavel/kwell/service/impl/WlsnServiceImpl.java
View file @ 615b96c0
...@@ -57,8 +57,8 @@ public class WlsnServiceImpl extends BaseEditServiceImpl implements WlsnService ...@@ -57,8 +57,8 @@ public class WlsnServiceImpl extends BaseEditServiceImpl implements WlsnService
@Override @Override
public void beforePost(BaseEntity entity) { public void beforePost(BaseEntity entity) {
if (entity instanceof Wlsn) { if (entity instanceof Wlsn) {
Wlsn wlsn = (Wlsn)entity; /*Wlsn wlsn = (Wlsn)entity;
/*if(StringUtils.isEmpty(wlsn.getHgdj())){ if(StringUtils.isEmpty(wlsn.getHgdj())){
wlsn.setHgdj(DpOcGradeEnum.A0.getId()); wlsn.setHgdj(DpOcGradeEnum.A0.getId());
}*/ }*/
} }
......
gavel/src/main/java/com/gavel/kwell/utils/ImageToBase64.java
View file @ 615b96c0
...@@ -89,10 +89,9 @@ public class ImageToBase64 { ...@@ -89,10 +89,9 @@ public class ImageToBase64 {
// 图像数据为空 // 图像数据为空
if (imgStr == null) if (imgStr == null)
return false; return false;
Base64 encoder = new Base64();
try { try {
// Base64解码 // Base64解码
byte[] b = encoder.decodeBase64(imgStr); byte[] b = Base64.decodeBase64(imgStr);
for (int i = 0; i < b.length; ++i) { for (int i = 0; i < b.length; ++i) {
if (b[i] < 0) {// 调整异常数据 if (b[i] < 0) {// 调整异常数据
b[i] += 256; b[i] += 256;
......
gavel/src/main/java/com/gavel/kwell/vo/GpResVO.java
View file @ 615b96c0
package com.gavel.kwell.vo; package com.gavel.kwell.vo;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.gavel.kwell.persistent.Gpbhgmx; import com.gavel.kwell.persistent.Gpbhgmx;
import com.gavel.kwell.persistent.Gpfk; import com.gavel.kwell.persistent.Gpfk;
public class GpResVO { public class GpResVO implements Serializable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
gavel/src/main/java/com/gavel/kwell/vo/GpbhgfkCondition.java
View file @ 615b96c0
package com.gavel.kwell.vo; package com.gavel.kwell.vo;
import java.io.Serializable;
import java.util.List; import java.util.List;
public class GpbhgfkCondition { public class GpbhgfkCondition implements Serializable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
gavel/src/main/java/com/gavel/kwell/vo/GpfkcxVO.java
View file @ 615b96c0
...@@ -7,6 +7,7 @@ import com.gavel.persistence.annotation.FieldMeta; ...@@ -7,6 +7,7 @@ import com.gavel.persistence.annotation.FieldMeta;
public class GpfkcxVO extends Gpfk { public class GpfkcxVO extends Gpfk {
private static final long serialVersionUID = 3877646077533972481L;
@FieldMeta(fieldName = "WOSN_CODE", caption = "序列号") @FieldMeta(fieldName = "WOSN_CODE", caption = "序列号")
private String wosnCode; private String wosnCode;
@FieldMeta(fieldName = "BZGX_CODE", caption = "工序编码") @FieldMeta(fieldName = "BZGX_CODE", caption = "工序编码")
......
gavel/src/main/java/com/gavel/kwell/vo/GpfkhzVO.java
View file @ 615b96c0
...@@ -9,6 +9,7 @@ import java.util.Date; ...@@ -9,6 +9,7 @@ import java.util.Date;
public class GpfkhzVO extends BaseEntity { public class GpfkhzVO extends BaseEntity {
private static final long serialVersionUID = 8533157621444610854L;
@FieldMeta(fieldName = "BZGX_ID", caption = "工序ID") @FieldMeta(fieldName = "BZGX_ID", caption = "工序ID")
private String bzgxId; private String bzgxId;
@FieldMeta(fieldName = "BZGX_CODE", caption = "工序编码") @FieldMeta(fieldName = "BZGX_CODE", caption = "工序编码")
......
gavel/src/main/java/com/gavel/kwell/vo/GpwxResVO.java
View file @ 615b96c0
package com.gavel.kwell.vo; package com.gavel.kwell.vo;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.gavel.kwell.persistent.Gpbhgmx; import com.gavel.kwell.persistent.Gpbhgmx;
...@@ -7,7 +8,7 @@ import com.gavel.kwell.persistent.Gpfk; ...@@ -7,7 +8,7 @@ import com.gavel.kwell.persistent.Gpfk;
import com.gavel.kwell.persistent.Gpwxmx; import com.gavel.kwell.persistent.Gpwxmx;
public class GpwxResVO { public class GpwxResVO implements Serializable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
gavel/src/main/java/com/gavel/kwell/vo/HzKcswCondition.java
View file @ 615b96c0
...@@ -7,7 +7,11 @@ import java.util.Date; ...@@ -7,7 +7,11 @@ import java.util.Date;
public class HzKcswCondition extends BaseEntity { public class HzKcswCondition extends BaseEntity {
private String swlx; /**
*
*/
private static final long serialVersionUID = 1L;
private String swlx;
private Date start; private Date start;
private Date end; private Date end;
private String wlid; private String wlid;
......
gavel/src/main/java/com/gavel/kwell/vo/HzWoVO.java
View file @ 615b96c0
...@@ -8,6 +8,10 @@ import java.util.Date; ...@@ -8,6 +8,10 @@ import java.util.Date;
public class HzWoVO extends Wo { public class HzWoVO extends Wo {
/**
*
*/
private static final long serialVersionUID = 1L;
@FieldMeta(fieldName = "GC_CODE", caption = "工厂编码") @FieldMeta(fieldName = "GC_CODE", caption = "工厂编码")
private String gcCode; private String gcCode;
@FieldMeta(fieldName = "GC_NAME", caption = "工厂名称") @FieldMeta(fieldName = "GC_NAME", caption = "工厂名称")
......
gavel/src/main/java/com/gavel/kwell/vo/WlSnruleVO.java
View file @ 615b96c0
...@@ -9,7 +9,8 @@ import com.gavel.persistence.annotation.FieldMeta; ...@@ -9,7 +9,8 @@ import com.gavel.persistence.annotation.FieldMeta;
**/ **/
public class WlSnruleVO extends Snrule { public class WlSnruleVO extends Snrule {
@FieldMeta(fieldName = "WLXX_ID", caption = "物料编码", length = 40) private static final long serialVersionUID = 7220952323536387600L;
@FieldMeta(fieldName = "WLXX_ID", caption = "物料编码", length = 40)
private String wlxxId; private String wlxxId;
@FieldMeta(fieldName = "WLXX_CODE", caption = "物料编码", length = 40) @FieldMeta(fieldName = "WLXX_CODE", caption = "物料编码", length = 40)
private String wlxxCode; private String wlxxCode;
......
gavel/src/main/java/com/gavel/kwell/vo/WosnMultiVO.java
View file @ 615b96c0
...@@ -8,7 +8,8 @@ import com.gavel.persistence.annotation.FieldMeta; ...@@ -8,7 +8,8 @@ import com.gavel.persistence.annotation.FieldMeta;
**/ **/
public class WosnMultiVO extends UWosnVO { public class WosnMultiVO extends UWosnVO {
@FieldMeta(fieldName = "LJWLCODE", caption = "物料编码") private static final long serialVersionUID = 1622449658227517555L;
@FieldMeta(fieldName = "LJWLCODE", caption = "物料编码")
private String ljwlxxCode; private String ljwlxxCode;
@FieldMeta(fieldName = "LJWLNAME", caption = "物料名称") @FieldMeta(fieldName = "LJWLNAME", caption = "物料名称")
private String ljwlxxName; private String ljwlxxName;
......
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