Skip to content

K
kwell-mes
Commit ad7b0f75 authored by yff's avatar yff
Browse files
Options

修改BUG

parent f3a790dc
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 59 deletions
gavel/src/main/java/com/gavel/kwell/controller/GphyController.java
View file @ ad7b0f75
...@@ -4,6 +4,7 @@ import com.gavel.common.BaseURL; ...@@ -4,6 +4,7 @@ import com.gavel.common.BaseURL;
import com.gavel.common.base.BaseEditJSON; import com.gavel.common.base.BaseEditJSON;
import com.gavel.common.converter.DataConvert; import com.gavel.common.converter.DataConvert;
import com.gavel.common.utils.StringUtils; import com.gavel.common.utils.StringUtils;
import com.gavel.kwell.persistent.Gpfk;
import com.gavel.kwell.service.GpfkService; 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;
...@@ -73,9 +74,9 @@ public class GphyController extends BaseController { ...@@ -73,9 +74,9 @@ public class GphyController extends BaseController {
@ResponseBody @ResponseBody
public Object query(@RequestBody JSONObject param) { public Object query(@RequestBody JSONObject param) {
GphyCondition condition = JSONObject.toJavaObject(param, GphyCondition.class); GphyCondition condition = JSONObject.toJavaObject(param, GphyCondition.class);
Integer code = gphyService.zpwl(condition); Gpfk gpfk = gphyService.zpwl(condition);
if(code!=null&&code>0) { if(gpfk!=null) {
return buildReturnData(code); return buildReturnData(gpfk);
} }
return ThreadContext.getReturnData(); return ThreadContext.getReturnData();
} }
......
gavel/src/main/java/com/gavel/kwell/controller/WosngzController.java
View file @ ad7b0f75
...@@ -22,6 +22,7 @@ import com.gavel.common.base.controller.BaseController; ...@@ -22,6 +22,7 @@ import com.gavel.common.base.controller.BaseController;
import com.gavel.common.converter.DataConvert; import com.gavel.common.converter.DataConvert;
import com.gavel.common.utils.StringUtils; import com.gavel.common.utils.StringUtils;
import com.gavel.kwell.service.GpfkService; import com.gavel.kwell.service.GpfkService;
import com.gavel.kwell.service.GphyService;
import com.gavel.persistence.sql.RecordSet; import com.gavel.persistence.sql.RecordSet;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -32,6 +33,9 @@ public class WosngzController extends BaseController { ...@@ -32,6 +33,9 @@ public class WosngzController extends BaseController {
@Autowired @Autowired
private GpfkService gpfkService; private GpfkService gpfkService;
@Autowired
private GphyService gphyService;
@ResourcePermissions() @ResourcePermissions()
@RequestMapping("/index") @RequestMapping("/index")
...@@ -117,8 +121,9 @@ public class WosngzController extends BaseController { ...@@ -117,8 +121,9 @@ public class WosngzController extends BaseController {
setReturnMessage("工票信息不允许为空！"); setReturnMessage("工票信息不允许为空！");
return returnData(); return returnData();
} }
List<GphyVO> gphyVOList = new ArrayList<>(); GphyCondition condition = new GphyCondition();
//List<GphyVO> gphyVOList = gpfkService.queryGphyListByGpid(gpfkid); condition.setMid(gpfkid);
List<GphyVO> gphyVOList = gphyService.query(condition).getRecords();
return buildReturnData(gphyVOList, GphyVO.class); return buildReturnData(gphyVOList, GphyVO.class);
} }
......
gavel/src/main/java/com/gavel/kwell/dao/GpfkDao.java
View file @ ad7b0f75
...@@ -122,7 +122,7 @@ public interface GpfkDao extends BaseDao { ...@@ -122,7 +122,7 @@ public interface GpfkDao extends BaseDao {
public GpfkVO queryKwellGpfkByWosnAndGxid(GpfkCondition condition); public GpfkVO queryKwellGpfkByWosnAndGxid(GpfkCondition condition);
public double queryWobomZpslByDjidAndWlid(String djid,String wlid); public double queryWobomZpslByDjidAndWlid(String fkid,String wlid);
public List<Gphy> queryGphyByGpfkid(String mid); public List<Gphy> queryGphyByGpfkid(String mid);
......
gavel/src/main/java/com/gavel/kwell/dao/GphyDao.java
View file @ ad7b0f75
...@@ -22,5 +22,7 @@ public interface GphyDao extends BaseDao { ...@@ -22,5 +22,7 @@ public interface GphyDao extends BaseDao {
public RecordSet<GphyVO> queryKwellZpGphy(GphyCondition condition); public RecordSet<GphyVO> queryKwellZpGphy(GphyCondition condition);
public List<WlslItem> queryKwellZpslGphy(GphyCondition condition); public WlslItem queryKwellZpslGphy(GphyCondition condition);
public int queryIfZpwc(GphyCondition condition);
} }
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ ad7b0f75
...@@ -1102,9 +1102,9 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1102,9 +1102,9 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WO on WO_ID = WOBOM_WOID"); sqlMap.append(" left join WO on WO_ID = WOBOM_WOID");
sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID"); sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID");
sqlMap.append(" left join WOGYLX on WOGYLX_WOID = WO_ID "); sqlMap.append(" left join WOGYLX on WOGYLX_WOID = WO_ID ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID "); sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID and BZGX_ID = WOBOM_FFGX");
sqlMap.append(" left join GPFK on GPFK_WOSNID = WOSN_CODE and GPFK_FKGX= BZGX_ID and GPFK_WOGYLX =WOGYLX_ID"); sqlMap.append(" left join GPFK on GPFK_WOSNID = WOSN_CODE and GPFK_FKGX= BZGX_ID and GPFK_WOGYLX =WOGYLX_ID");
sqlMap.append(" left join (select sum(GPHY_ZPSL) as ZPSL,GPHY_MID,GPHY_WLID from GPHY group by GPHY_MID,GPHY_WLID) k on k.GPHY_MID = GPFK_ID and k.GPHY_WLID = WLXX_ID"); sqlMap.append(" left join (select sum(GPHY_ZPSL) as ZPSL,GPHY_MID,GPHY_WLID,GPHY_FKGX from GPHY group by GPHY_MID,GPHY_WLID) k on k.GPHY_FKGX=WOBOM_FFGX and k.GPHY_MID = GPFK_ID and k.GPHY_WLID = WLXX_ID");
sqlMap.append("where 1=1"); sqlMap.append("where 1=1");
if (StringUtils.isNotEmpty(woid)){ if (StringUtils.isNotEmpty(woid)){
sqlMap.append(" and " + SqlUtil.getWhereSql("WO_ID", woid)); sqlMap.append(" and " + SqlUtil.getWhereSql("WO_ID", woid));
...@@ -1203,17 +1203,18 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1203,17 +1203,18 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
@Override @Override
public double queryWobomZpslByDjidAndWlid(String djid,String wlid) { public double queryWobomZpslByDjidAndWlid(String fkid,String wlid) {
SqlMap sqlMap = new SqlMap(); SqlMap sqlMap = new SqlMap();
sqlMap.append("select sum(WOBOM_XQSL) "); sqlMap.append("select WOBOM_DWYL ");
sqlMap.append("from WOBOM"); sqlMap.append("from WOBOM");
sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID"); sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID");
sqlMap.append(" left join WO on WO_ID = WOBOM_WOID"); sqlMap.append(" left join WO on WO_ID = WOBOM_WOID");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = WOBOM_FFGX "); sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID");
sqlMap.append(" left join GPFK on GPFK_WOSNID = WOSN_CODE and WOBOM_FFGX = GPFK_FKGX ");
sqlMap.append("where 1=1"); sqlMap.append("where 1=1");
if (StringUtils.isNotEmpty(djid)){ if (StringUtils.isNotEmpty(fkid)){
sqlMap.append(" and " + SqlUtil.getWhereSql("WO_DJID", djid)); sqlMap.append(" and " + SqlUtil.getWhereSql("GPFK_ID", fkid));
sqlMap.setParamValue("WO_DJID", djid); sqlMap.setParamValue("GPFK_ID", fkid);
} }
if (StringUtils.isNotEmpty(wlid)){ if (StringUtils.isNotEmpty(wlid)){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOBOM_WLID", wlid)); sqlMap.append(" and " + SqlUtil.getWhereSql("WOBOM_WLID", wlid));
......
gavel/src/main/java/com/gavel/kwell/dao/impl/GphyDaoImpl.java
View file @ ad7b0f75
package com.gavel.kwell.dao.impl; package com.gavel.kwell.dao.impl;
import org.springframework.stereotype.Repository;
import com.gavel.common.base.dao.impl.BaseDaoImpl; import com.gavel.common.base.dao.impl.BaseDaoImpl;
import com.gavel.common.utils.StringUtils; import com.gavel.common.utils.StringUtils;
import com.gavel.kwell.dao.GphyDao; import com.gavel.kwell.dao.GphyDao;
...@@ -11,10 +13,6 @@ import com.gavel.persistence.sql.RecordSet; ...@@ -11,10 +13,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 java.util.List;
import org.springframework.stereotype.Repository;
@Repository("gphyDao") @Repository("gphyDao")
public class GphyDaoImpl extends BaseDaoImpl implements GphyDao { public class GphyDaoImpl extends BaseDaoImpl implements GphyDao {
...@@ -135,7 +133,7 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao { ...@@ -135,7 +133,7 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao {
} }
@Override @Override
public List<WlslItem> queryKwellZpslGphy(GphyCondition condition) { public WlslItem queryKwellZpslGphy(GphyCondition condition) {
SqlMap sqlMap = new SqlMap(); SqlMap sqlMap = new SqlMap();
sqlMap.append("select sum(GPHY_ZPSL) as zpsl, GPHY_WLID as wlid "); sqlMap.append("select sum(GPHY_ZPSL) as zpsl, GPHY_WLID as wlid ");
sqlMap.append("from GPHY "); sqlMap.append("from GPHY ");
...@@ -149,7 +147,28 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao { ...@@ -149,7 +147,28 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao {
sqlMap.append(" and " + SqlUtil.getWhereSql("GPHY_WLID", condition.getWlid())); sqlMap.append(" and " + SqlUtil.getWhereSql("GPHY_WLID", condition.getWlid()));
sqlMap.setParamValue("GPHY_WLID", condition.getWlid()); sqlMap.setParamValue("GPHY_WLID", condition.getWlid());
} }
return sqlMap.query(WlslItem.class); return sqlMap.queryEntity(WlslItem.class);
}
@Override
public int queryIfZpwc(GphyCondition condition) {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select isnull(a.sl,0)-b.sl FROM( select sum(wobom_dwyl) as sl ,GPFK_ID as fkid ");
sqlMap.append(" from GPFK ");
sqlMap.append(" left join WOBOM on WOBOM_FFGX =GPFK_fkgx ");
sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID ");
sqlMap.append(" left join WO on WO_ID = WOBOM_WOID ");
sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID and WOSN_CODE =GPFK_WOSNID ");
sqlMap.append(" GROUP BY GPFK_ID ) a ");
sqlMap.append(" left join (select count(1) as sl,GPHY_MID as fkid ");
sqlMap.append(" from GPHY ");
sqlMap.append(" group by GPHY_MID) b on b.fkid =a.fkid ");
sqlMap.append("where 1 = 1 ");
if (StringUtils.isNotEmpty(condition.getMid())){
sqlMap.append(" and " + SqlUtil.getWhereSql("b.fkid", condition.getMid()));
sqlMap.setParamValue("b.fkid", condition.getMid());
}
return sqlMap.queryInt();
} }
......
gavel/src/main/java/com/gavel/kwell/service/GphyService.java
View file @ ad7b0f75
...@@ -3,6 +3,7 @@ package com.gavel.kwell.service; ...@@ -3,6 +3,7 @@ package com.gavel.kwell.service;
import java.util.List; import java.util.List;
import com.gavel.common.base.service.BaseEditService; import com.gavel.common.base.service.BaseEditService;
import com.gavel.kwell.persistent.Gpfk;
import com.gavel.kwell.vo.GphyCondition; import com.gavel.kwell.vo.GphyCondition;
import com.gavel.kwell.vo.GphyVO; import com.gavel.kwell.vo.GphyVO;
import com.gavel.kwell.vo.GphycxVO; import com.gavel.kwell.vo.GphycxVO;
...@@ -23,10 +24,10 @@ public interface GphyService extends BaseEditService { ...@@ -23,10 +24,10 @@ public interface GphyService extends BaseEditService {
public void queryGphyWithOrGphy(GphyCondition condition); public void queryGphyWithOrGphy(GphyCondition condition);
public Integer zpwl(GphyCondition condition); public Gpfk zpwl(GphyCondition condition);
public Integer compareIsZpComplete(String djid); public boolean compareIsZpComplete(String fkid,String wlid);
public List<WlslItem> querywlzpsl(GphyCondition condition); public WlslItem querywlzpsl(GphyCondition condition);
} }
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ ad7b0f75
...@@ -76,6 +76,7 @@ import com.gavel.wo.vo.PcjhCondition; ...@@ -76,6 +76,7 @@ import com.gavel.wo.vo.PcjhCondition;
import com.gavel.wo.vo.PcjhmxCondition; import com.gavel.wo.vo.PcjhmxCondition;
import com.gavel.wo.vo.PcjhmxVO; import com.gavel.wo.vo.PcjhmxVO;
import com.gavel.wo.vo.WobomVO; import com.gavel.wo.vo.WobomVO;
import com.gavel.wo.vo.WogylxVO;
@Service("gpfkService") @Service("gpfkService")
...@@ -161,7 +162,15 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -161,7 +162,15 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gphydao.batchDelete(gphymxList); gphydao.batchDelete(gphymxList);
} }
/** 排产计划删除 末道工序 、单道工序**/ /** 排产计划删除 末道工序 、单道工序**/
// Wogylx bzgx = (Bzgx) GavelSql.selectEntityByKey(Bzgx.class, gpfk.getFkgx()); Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfk.getWogylx());
if(StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfk.getHgbz())&&gpfk.getHgbz().equals("N")) {
cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
}
else {
cancelPcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
}
}
} }
} }
...@@ -800,10 +809,12 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -800,10 +809,12 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
EntityDataFactory.copyEntity(gpfkVo, gpfk); EntityDataFactory.copyEntity(gpfkVo, gpfk);
if(SmCodeEnum.OKBZ.getId().equals(hgsn)) { if(SmCodeEnum.OKBZ.getId().equals(hgsn)) {
gpfk.setHgbz("Y");
gpfk.setHgsl(1.0); gpfk.setHgsl(1.0);
gpfk.setBhgsl(0.0); gpfk.setBhgsl(0.0);
} }
else if(SmCodeEnum.NGBZ.getId().equals(hgsn)) { else if(SmCodeEnum.NGBZ.getId().equals(hgsn)) {
gpfk.setHgbz("N");
gpfk.setHgsl(0.0); gpfk.setHgsl(0.0);
gpfk.setBhgsl(1.0); gpfk.setBhgsl(1.0);
} }
...@@ -811,6 +822,15 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -811,6 +822,15 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
throwReturnMessage(SmCodeEnum.ERROR_CODE); throwReturnMessage(SmCodeEnum.ERROR_CODE);
} }
Gpfk gpfkR = (Gpfk) update(gpfk); Gpfk gpfkR = (Gpfk) update(gpfk);
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfk.getWogylx());
if(StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfk.getHgbz())&&gpfk.getHgbz().equals("N")) {
updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
}
else {
updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
}
}
return gpfkR; return gpfkR;
} }
...@@ -822,10 +842,12 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -822,10 +842,12 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
Gpfk gpfk = new Gpfk(); Gpfk gpfk = new Gpfk();
EntityDataFactory.copyEntity(gpfkVo, gpfk); EntityDataFactory.copyEntity(gpfkVo, gpfk);
if(SmCodeEnum.OKBZ.getId().equals(hgsn)) { if(SmCodeEnum.OKBZ.getId().equals(hgsn)) {
gpfk.setHgbz("Y");
gpfk.setHgsl(1.0); gpfk.setHgsl(1.0);
gpfk.setBhgsl(0.0); gpfk.setBhgsl(0.0);
} }
else if(SmCodeEnum.NGBZ.getId().equals(hgsn)) { else if(SmCodeEnum.NGBZ.getId().equals(hgsn)) {
gpfk.setHgbz("N");
gpfk.setHgsl(0.0); gpfk.setHgsl(0.0);
gpfk.setBhgsl(1.0); gpfk.setBhgsl(1.0);
} }
...@@ -833,6 +855,15 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -833,6 +855,15 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
throwReturnMessage(SmCodeEnum.ERROR_CODE); throwReturnMessage(SmCodeEnum.ERROR_CODE);
} }
Gpfk gpfkR = (Gpfk) update(gpfk); Gpfk gpfkR = (Gpfk) update(gpfk);
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfk.getWogylx());
if(StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfk.getHgbz())&&gpfk.getHgbz().equals("N")) {
updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
}
else {
updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
}
}
return gpfkR; return gpfkR;
} }
......
gavel/src/main/java/com/gavel/kwell/service/impl/GphyServiceImpl.java
View file @ ad7b0f75
...@@ -7,11 +7,15 @@ import org.springframework.stereotype.Service; ...@@ -7,11 +7,15 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.gavel.common.base.service.impl.BaseEditServiceImpl; import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.common.sql.GavelSql;
import com.gavel.common.utils.DateUtils; import com.gavel.common.utils.DateUtils;
import com.gavel.common.utils.StringUtils;
import com.gavel.jcsj.service.CoderuleService; import com.gavel.jcsj.service.CoderuleService;
import com.gavel.kwell.dao.GpfkDao; import com.gavel.kwell.dao.GpfkDao;
import com.gavel.kwell.dao.GphyDao; import com.gavel.kwell.dao.GphyDao;
import com.gavel.kwell.persistent.Gpfk;
import com.gavel.kwell.persistent.Gphy; import com.gavel.kwell.persistent.Gphy;
import com.gavel.kwell.service.GpfkService;
import com.gavel.kwell.service.GphyService; import com.gavel.kwell.service.GphyService;
import com.gavel.kwell.utils.HzGylxEnum; import com.gavel.kwell.utils.HzGylxEnum;
import com.gavel.kwell.vo.GphyCondition; import com.gavel.kwell.vo.GphyCondition;
...@@ -19,18 +23,12 @@ import com.gavel.kwell.vo.GphyVO; ...@@ -19,18 +23,12 @@ import com.gavel.kwell.vo.GphyVO;
import com.gavel.kwell.vo.GphycxVO; import com.gavel.kwell.vo.GphycxVO;
import com.gavel.kwell.vo.WlslItem; import com.gavel.kwell.vo.WlslItem;
import com.gavel.persistence.sql.RecordSet; import com.gavel.persistence.sql.RecordSet;
import com.gavel.wo.persistent.Wogylx;
@Service("gphyService") @Service("gphyService")
@Transactional @Transactional
public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService { public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService {
/**装配完成**/
private static final Integer COMPLETE_CODE =230;
/**装配成功**/
private static final Integer ZP_CODE =200;
/**相同序列号**/
private static final Integer SAME_CODE =100;
@Autowired @Autowired
private GphyDao gphyDao; private GphyDao gphyDao;
...@@ -38,6 +36,9 @@ public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService ...@@ -38,6 +36,9 @@ public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService
@Autowired @Autowired
private GpfkDao gpfkDao; private GpfkDao gpfkDao;
@Autowired
private GpfkService gpfkService;
@Autowired @Autowired
private CoderuleService coderuleService; private CoderuleService coderuleService;
...@@ -72,43 +73,51 @@ public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService ...@@ -72,43 +73,51 @@ public class GphyServiceImpl extends BaseEditServiceImpl implements GphyService
} }
@Override @Override
public Integer zpwl(GphyCondition condition) { public Gpfk zpwl(GphyCondition condition) {
List<GphyVO> gphyVO =gphyDao.queryKwellZpGphy(condition).getRecords();
if(gphyVO!=null&&gphyVO.size()>0) {
return SAME_CODE;
}
String wlid = coderuleService.matchCodeByRule(condition.getSnid()); String wlid = coderuleService.matchCodeByRule(condition.getSnid());
Gphy gphy = new Gphy(); if(compareIsZpComplete(condition.getFkid(),wlid)) {
gphy.setFkgx(condition.getGxid()); Gphy gphy = new Gphy();
gphy.setWlid(wlid); gphy.setFkgx(condition.getGxid());
gphy.setMid(condition.getFkid()); gphy.setWlid(wlid);
gphy.setWlsnid(condition.getSnid()); gphy.setMid(condition.getFkid());
gphy.setFksj(DateUtils.getDate()); gphy.setWlsnid(condition.getSnid());
gphy.setZpsl(1.0); gphy.setFksj(DateUtils.getDate());
gphy.setHylx(HzGylxEnum.ZP.getId()); gphy.setZpsl(1.0);
insert(gphy); gphy.setHylx(HzGylxEnum.ZP.getId());
return compareIsZpComplete(condition.getMid()); insert(gphy);
}
Gpfk gpfk = gpfkDao.queryById(Gpfk.class, condition.getFkid());
if(gphyDao.queryIfZpwc(condition)!=0) {
Wogylx wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, gpfk.getWogylx());
if(StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
if(StringUtils.isNotEmpty(gpfk.getHgbz())&&gpfk.getHgbz().equals("N")) {
gpfkService.updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),false);
}
else {
gpfkService.updatePcjh(wogylx.getWoid(),wogylx.getGxlx(),true);
}
}
}
return gpfk;
} }
@Override @Override
public Integer compareIsZpComplete(String woid) { public boolean compareIsZpComplete(String fkid,String wlid) {
GphyCondition condition =new GphyCondition(); GphyCondition condition =new GphyCondition();
condition.setMid(woid); condition.setMid(fkid);
List<WlslItem> wlslItem =querywlzpsl(condition); condition.setWlid(wlid);
if(wlslItem!=null&&wlslItem.size()>0) { WlslItem wlslItem =querywlzpsl(condition);
for(int i=0;i<wlslItem.size();i++) { if(wlslItem!=null) {
double xqsl =gpfkDao.queryWobomZpslByDjidAndWlid(woid, wlslItem.get(i).getWlid()); double dwyl =gpfkDao.queryWobomZpslByDjidAndWlid(fkid, wlid);
if(xqsl!=wlslItem.get(i).getZpsl()) { if(dwyl<=wlslItem.getZpsl()) {
return ZP_CODE; throwReturnMessage("该物料装配完成");
} }
} }
return COMPLETE_CODE; return true;
}
return ZP_CODE;
} }
@Override @Override
public List<WlslItem> querywlzpsl(GphyCondition condition) { public WlslItem querywlzpsl(GphyCondition condition) {
return gphyDao.queryKwellZpslGphy(condition); return gphyDao.queryKwellZpslGphy(condition);
} }
} }
......
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