Commit c0ecc236 authored by yff's avatar yff

修改BUG

parent bfbcf0a3
...@@ -29,7 +29,9 @@ public class GpfkForBzgxFjController extends BaseController { ...@@ -29,7 +29,9 @@ public class GpfkForBzgxFjController extends BaseController {
Attachment file = gpfkfjService.queryBzgxFj(bzlx, type); Attachment file = gpfkfjService.queryBzgxFj(bzlx, type);
if(file !=null) { if(file !=null) {
FileInputStream fileInputStream = attachmentService.download(file.getId()); FileInputStream fileInputStream = attachmentService.download(file.getId());
doAttachmentPreview(file.getId(), response, fileInputStream); if(fileInputStream!=null) {
doAttachmentPreview(file.getId(), response, fileInputStream);
}
} }
} }
......
...@@ -1616,6 +1616,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1616,6 +1616,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" LEFT JOIN WOBOM dwb ON dwb.WOBOM_woid = dw.WO_ID "); sqlMap.append(" LEFT JOIN WOBOM dwb ON dwb.WOBOM_woid = dw.WO_ID ");
sqlMap.append(" LEFT JOIN WOGYLX dwg ON dwg.WOGYLX_ID =dwb.WOBOM_FFGX "); sqlMap.append(" LEFT JOIN WOGYLX dwg ON dwg.WOGYLX_ID =dwb.WOBOM_FFGX ");
sqlMap.append(" LEFT JOIN BZGX db ON db.BZGX_ID = dwg.WOGYLX_BZGXID "); sqlMap.append(" LEFT JOIN BZGX db ON db.BZGX_ID = dwg.WOGYLX_BZGXID ");
sqlMap.append(" where WOBOM_GJWL ='Y' ");
sqlMap.append(" GROUP BY dwo.WOSN_CODE,db.BZGX_ID "); sqlMap.append(" GROUP BY dwo.WOSN_CODE,db.BZGX_ID ");
sqlMap.append(" ) e "); sqlMap.append(" ) e ");
sqlMap.append(" LEFT JOIN ( "); sqlMap.append(" LEFT JOIN ( ");
...@@ -1623,6 +1624,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao { ...@@ -1623,6 +1624,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" LEFT JOIN GPFK c on c.GPFK_ID = GPHY_MID "); sqlMap.append(" LEFT JOIN GPFK c on c.GPFK_ID = GPHY_MID ");
sqlMap.append(" Left JOIN WOGYLX cw ON cw.WOGYLX_ID = c.GPFK_FKGX "); sqlMap.append(" Left JOIN WOGYLX cw ON cw.WOGYLX_ID = c.GPFK_FKGX ");
sqlMap.append(" LEFT JOIN BZGX cb ON cb.BZGX_ID = cw.WOGYLX_BZGXID "); sqlMap.append(" LEFT JOIN BZGX cb ON cb.BZGX_ID = cw.WOGYLX_BZGXID ");
sqlMap.append(" LEFT JOIN WOBOM cdwb ON cdwb.WOBOM_WOID = cw.WOGYLX_woid and cdwb.WOBOM_FFGX = c.GPFK_FKGX and wobom_wlid = GPHY_wlid ");
sqlMap.append(" where WOBOM_GJWL ='Y' ");
sqlMap.append(" GROUP BY c.GPFK_WOSNID,cb.BZGX_ID "); sqlMap.append(" GROUP BY c.GPFK_WOSNID,cb.BZGX_ID ");
sqlMap.append(" ) a ON a.cwosn = e.dwosn and a.cbzgx = e.dbzgx "); sqlMap.append(" ) a ON a.cwosn = e.dwosn and a.cbzgx = e.dbzgx ");
sqlMap.append(" where 1=1 "); sqlMap.append(" where 1=1 ");
......
...@@ -165,7 +165,7 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao { ...@@ -165,7 +165,7 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao {
sqlMap.append(" left join (select count(1) as sl,GPHY_MID as fkid "); sqlMap.append(" left join (select count(1) as sl,GPHY_MID as fkid ");
sqlMap.append(" from GPHY "); sqlMap.append(" from GPHY ");
sqlMap.append(" group by GPHY_MID) b on b.fkid =a.fkid "); sqlMap.append(" group by GPHY_MID) b on b.fkid =a.fkid ");
sqlMap.append("where 1 = 1 "); sqlMap.append("where 1 = 1 and ");
if (StringUtils.isNotEmpty(condition.getMid())){ if (StringUtils.isNotEmpty(condition.getMid())){
sqlMap.append(" and b.fkid = '" + condition.getMid()+"'"); sqlMap.append(" and b.fkid = '" + condition.getMid()+"'");
} }
......
...@@ -1419,8 +1419,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1419,8 +1419,8 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
throwReturnMessage("上道工序未完成不能反馈此道工序,请重新确认!"); throwReturnMessage("上道工序未完成不能反馈此道工序,请重新确认!");
} }
} }
if((existLastWogylx.getGxlx()).equals(YymkFKEnum.JY.getId())) { if((existLastWogylx.getGxlx()).equals(YymkFKEnum.JY.getId())||(existLastWogylx.getGxlx()).equals(YymkFKEnum.JG.getId())) {
if(StringUtils.isNotEmpty(gpfkVo2.getHgbz())&&(gpfkVo2.getHgbz().equals("Y")||gpfkVo2.getHgdj().equals(GpfkHgEnum.JYHG.getId())||gpfkVo2.getHgdj().equals(GpfkHgEnum.WXHG.getId()))) { if(StringUtils.isNotEmpty(gpfkVo2.getHgbz())&&(gpfkVo2.getHgbz().equals("Y"))) {
} }
else { else {
...@@ -1484,7 +1484,6 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService ...@@ -1484,7 +1484,6 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
/** 判断该物料是否装配完成*/ /** 判断该物料是否装配完成*/
public void compareIsZpComplete(GphyCondition gphyCondition) { public void compareIsZpComplete(GphyCondition gphyCondition) {
System.out.println("ss");
WlslItem wlslItem =gpfkDao.queryKwellZpslGphy(gphyCondition); WlslItem wlslItem =gpfkDao.queryKwellZpslGphy(gphyCondition);
if(wlslItem!=null) { if(wlslItem!=null) {
double dwyl =gpfkDao.queryWobomZpslByDjidAndWlidUpgrade(gphyCondition.getWosncode(),gphyCondition.getBzgxid(), gphyCondition.getWlid()); double dwyl =gpfkDao.queryWobomZpslByDjidAndWlidUpgrade(gphyCondition.getWosncode(),gphyCondition.getBzgxid(), gphyCondition.getWlid());
......
...@@ -212,11 +212,9 @@ ...@@ -212,11 +212,9 @@
height: '100%', height: '100%',
width:"100%", width:"100%",
fitColumns: false, fitColumns: false,
// rowStyler:function(index,row){ rowStyler:function(index,row){
// if(index<2){ return 'background-color:#ADADAD;color:#fff;';
// return 'background-color:#6293BB;color:#fff;'; },
// }
// },
columns:jgfk_columns, columns:jgfk_columns,
data: that.tabdata data: that.tabdata
} }
......
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