Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java

@@ -900,9 +900,9 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         return sqlMap.getRecordSet();
     }
 
-    
- 
-    
+
+
+
     @Override
     public GpfkVO queryDailyFkInfo(GpfkCondition condition){
         SqlMap sqlMap = new SqlMap();
@@ -1084,7 +1084,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         return sqlMap.queryEntity(GpfkVO.class);
     }
 
-    
+
     @Override
 	public WosngzVO queryKwellWoBySnid(String snid){
         SqlMap sqlMap = new SqlMap();
@@ -1174,7 +1174,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	      }
 	      return sqlMap.queryEntity(GylxVO.class);
 	}
-	
+
 	@Override
 	public FkVO queryKwellGpfkByWosnAndGxid(FkCondition condition){
 			SqlMap sqlMap = new SqlMap();
@@ -1251,7 +1251,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.setParamValue(" pBZGXID ",bzgx);
 	        return sqlMap.queryEntity(FkVO.class);
 	}
-	
+
 
 
 
@@ -1287,7 +1287,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         }
         return sqlMap.queryDouble();
 	}
-	
+
 	@Override
 	public List<WobomVO> queryWobomByFkidAndWlid(String fkid,String wlid,String bzlx) {
 		 SqlMap sqlMap = new SqlMap();
@@ -1376,7 +1376,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append("LEFT JOIN WLXX ON WLXX_ID = GPHY_WLID ");
         sqlMap.append("where 1 = 1 ");
         if (StringUtils.isNotEmpty(condition.getSnid())){
-        	sqlMap.append("  and (WLXX_CODE = :pSnid) ");
+        	sqlMap.append("  and (GPHY_WLSNID = :pSnid) ");
             sqlMap.setParamValue("pSnid", condition.getSnid());
         }
         if (StringUtils.isNotEmpty(condition.getMid())){
@@ -1447,7 +1447,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append("order by GPFK_FKSJ desc ");
         return sqlMap.query(FkVO.class);
 	}
-	
+
 	@Override
 	public FkVO queryKwellWoBySnidUptoDate(String wosnid, String bzgx) {
 		 	SqlMap sqlMap = new SqlMap();
@@ -1468,7 +1468,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.append(" order by GPFK_FKSJ DESC ");
 	        return sqlMap.queryEntity(FkVO.class);
 	}
-	
+
 	@Override
 	public List<FkVO> queryKwellAllGpfkByWosnAndGxid(FkCondition condition){
 			SqlMap sqlMap = new SqlMap();
@@ -1530,7 +1530,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         return sqlMap.queryEntity(GpfkVO.class);
 	}
 
-	
+
 	@Override
 	public Wogylx getLastGx(Wogylx wogylx) {
 		 SqlMap sqlMap = new SqlMap();
@@ -1558,8 +1558,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.setParamValue("pXH",wogylx.getXh());
 	        return sqlMap.queryEntity(Wogylx.class);
 	}
-	
-	
+
+
 	@Override
 	public Wogylx getNextGxUpdate(Wogylx wogylx) {
 		 SqlMap sqlMap = new SqlMap();
@@ -1731,7 +1731,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	          sqlMap.setParamValue("WOBOM_WLID", wlid);
 	      }
 	     sqlMap.append(" group by WOSN_CODE,bzgx_id,wobom_wlid ");
-	     
+
 	      return sqlMap.queryDouble();
 	}
 
@@ -1761,7 +1761,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append("order by GPFK_FKSJ desc, GPFK_FKGX ");
         return sqlMap.queryEntity(GpfkVO.class);
 	}
-	
-	
+
+
 }
 

gavel/src/main/resources/module.xml

@@ -43,11 +43,9 @@
         <menu mkid="1901000600" mkmc="维修反馈" url="kmes/gpwx/index" gnlx="M">
         </menu>
     </menu>
-    <menu mkid="510020000"  mkmc="排产计划">
-			<menu mkid="510020100"  mkmc="排产计划维护" url="kmes/pcjhk/index">
-				<print entity="com.gavel.kwell.vo.PcjhkVO"  type="M"/>
-				<print entity="com.gavel.kwell.vo.PcjhmxkVO"  type="D"/>
-			</menu>
+	<menu fmkid="510020000" mkid="510020300"  mkmc="排产计划维护" url="kmes/pcjhk/index">
+			<print entity="com.gavel.kwell.vo.PcjhkVO"  type="M"/>
+			<print entity="com.gavel.kwell.vo.PcjhmxkVO"  type="D"/>
 	</menu>
     <disableMenus>
     	<menu mkid="510050000" mkmc="生产入库"/>