Skip to content

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

修改BUG

parent a0df138f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 56 deletions
gavel/src/main/java/com/gavel/kwell/dao/GpfkDao.java
View file @ d4183e15
......@@ -123,7 +123,7 @@ public interface GpfkDao extends BaseDao {
public GylxVO queryKwellWoStandGylx(String djid,String bzgx);
public GpfkVO queryKwellGpfkByWosnAndGxid(FkCondition condition);
public FkVO queryKwellGpfkByWosnAndGxid(FkCondition condition);
public double queryWobomZpslByDjidAndWlid(String fkid,String wlid);
......
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ d4183e15
......@@ -1048,7 +1048,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID ");
sqlMap.append(" left join WO on WO_ID = WOSN_WOID ");
sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID ");
sqlMap.append(" left join BZGX on BZGX_ID = GPFK_FKGX ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_FKGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append("where 1 = 1 ");
sqlMap.append(" and GPFK_FKLX = :pFKLX ");
sqlMap.append(" and GPFK_WOSNID = :pWOSNID ");
......@@ -1103,9 +1104,9 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
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");
sqlMap.append(" left join WOGYLX on WOGYLX_WOID = WO_ID ");
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 WOGYLX on WOGYLX_ID = WOBOM_FFGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append(" left join GPFK on GPFK_WOSNID = WOSN_CODE and GPFK_FKGX= WOGYLX_ID and GPFK_WOGYLX =WOGYLX_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");
if (StringUtils.isNotEmpty(woid)){
......@@ -1151,13 +1152,13 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
}
@Override
public GpfkVO queryKwellGpfkByWosnAndGxid(FkCondition condition){
public FkVO queryKwellGpfkByWosnAndGxid(FkCondition condition){
SqlMap sqlMap = new SqlMap();
sqlMap.append("select GPFK_ID, GPFK_WOSNID, GPFK_FKLX, GPFK_FKSJ, GPFK_HGBZ, GPFK_FKSL, ");
sqlMap.append(" GPFK_HGSL, GPFK_BHGSL, GPFK_FKR, GPFK_FKGX, GPFK_BZ, ");
sqlMap.append(" GPFK_WHRID, GPFK_WHR, GPFK_WHSJ, GPFK_CJRID, GPFK_CJR, ");
sqlMap.append(" GPFK_CJSJ, GPFK_SYSVERSION, GPFK_FKRID, GPFK_FKBX, GPFK_FKJSSJ, ");
sqlMap.append(" BX_CODE, BX_NAME, BZGX_CODE, BZGX_NAME, ");
sqlMap.append(" BX_CODE, BX_NAME, BZGX_CODE, BZGX_NAME,WLXX_ID, ");
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, WO_DJID,WO_ID, ");
sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_YWRQ, GPFK_HGDJ, WOSN_KHCODE");
sqlMap.append("from GPFK ");
......@@ -1165,12 +1166,12 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID ");
sqlMap.append(" left join WO on WO_ID = WOSN_WOID ");
sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX ");
sqlMap.append(" left join BZGX on BZGX_ID = GPFK_FKGX ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_FKGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append("where 1 = 1 ");
if (StringUtils.isNotEmpty(condition.getBzgxid())){
sqlMap.append(" and GPFK_FKGX = :pFKGX ");
sqlMap.setParamValue("pFKGX",condition.getBzgxid());
sqlMap.append(" and BZGX_ID = :pBZGXID ");
sqlMap.setParamValue("pBZGXID",condition.getBzgxid());
}
if (StringUtils.isNotEmpty(condition.getWogylx())){
sqlMap.append(" and WOGYLX_ID = :pWOGYLX ");
......@@ -1181,7 +1182,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.setParamValueLike("pWOSNID", condition.getWosncode());
}
sqlMap.append("order by GPFK_FKSJ desc, GPFK_FKGX ");
return sqlMap.queryEntity(GpfkVO.class);
return sqlMap.queryEntity(FkVO.class);
}
......@@ -1301,7 +1302,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" left join WO on WO_ID = WOBOM_WOID");
sqlMap.append(" left join WOSN on WOSN_WOID = WO_ID");
sqlMap.append(" left join WOGYLX on WOGYLX_WOID = WO_ID ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID and BZGX_ID = WOBOM_FFGX");
sqlMap.append(" left join BZGX on WOGYLX_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("where 1=1");
if (StringUtils.isNotEmpty(bzlx)){
......@@ -1345,10 +1346,12 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
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");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = WOBOM_FFGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append("where 1=1");
if (StringUtils.isNotEmpty(fkCondition.getBzgxid())){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOBOM_FFGX", fkCondition.getBzgxid()));
sqlMap.setParamValue("WOBOM_FFGX", fkCondition.getBzgxid());
sqlMap.append(" and " + SqlUtil.getWhereSql("BZGX_ID", fkCondition.getBzgxid()));
sqlMap.setParamValue("BZGX_ID", fkCondition.getBzgxid());
}
if (StringUtils.isNotEmpty(fkCondition.getWosncode())){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOSN_CODE", fkCondition.getWosncode()));
......@@ -1358,6 +1361,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" and " + SqlUtil.getWhereSql("WLXX_ID", fkCondition.getWlxxId()));
sqlMap.setParamValue("WLXX_ID", fkCondition.getWlxxId());
}
System.out.println(sqlMap.getSqlText());
return sqlMap.queryDouble();
}
......
gavel/src/main/java/com/gavel/kwell/vo/FkCondition.java
View file @ d4183e15
......@@ -13,6 +13,8 @@ public class FkCondition extends BaseEntity {
private String wogylx;
private String wlid;
public String getWlid() {
return wlid;
}
......
gavel/src/main/java/com/gavel/kwell/vo/FkVO.java
View file @ d4183e15
......@@ -92,7 +92,7 @@ public class FkVO extends BaseEntity {
@FieldMeta(fieldName = "GPFK_HGDJ", caption = "合格等级")
private String hgdj;
@FieldMeta(fieldName = "GPFK_WLID", caption = "物料编码")
@FieldMeta(fieldName = "WLXX_ID", caption = "物料编码")
private String wlid;
@FieldMeta(fieldName = "BX_CODE", caption = "班型编码")
private String bxCode;
......
gavel/src/main/resources/templates/views/kmes/gphy/index.html
View file @ d4183e15
......@@ -118,7 +118,7 @@
if(res.data&&res.data.records){
/* 赋值操作 */
that.gd = res.data.records.woDjid;
that.cpsn = res.data.records.wosnid;
that.cpsn = res.data.records.wosnCode;
that.ph = res.data.records.wlxxCode;
let woid = res.data.records.woid;
that.fkid=res.data.records.id||""
......
gavel/src/main/resources/templates/views/kmes/gpjy/index.html
View file @ d4183e15
......@@ -106,7 +106,7 @@
that.hg= res.data.records.hgsl||0;
that.ng= res.data.records.bhgsl||0;
that.gd = res.data.records.woDjid;
that.cpsn = res.data.records.wosnid;
that.cpsn = res.data.records.wosnCode;
that.ph = res.data.records.wlxxCode;
let woid = res.data.records.woDjid;
that.fkid = res.data.records.id;
......
gavel/src/main/resources/templates/views/kmes/gpwx/index.html
View file @ d4183e15
......@@ -122,7 +122,7 @@
that.hg= res.data.records.hgsl||0;
that.ng= res.data.records.bhgsl||0;
that.gd = res.data.records.woDjid;
that.cpsn = res.data.records.wosnid;
that.cpsn = res.data.records.wosnCode;
that.ph = res.data.records.wlxxCode;
let woid = res.data.records.woDjid;
that.fkid = res.data.records.id;
......
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