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

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

@@ -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())){

gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java

@@ -1433,7 +1433,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 	public boolean  checkIsCurrentGx(FkVO curFkVo) {
 		boolean flag = false;
 		GpfkVO  gpfk = gpfkDao.queryGpfkByWosnUptoDate(curFkVo.getWosnCode());
-		if((curFkVo!=null&&gpfk!=null&&StringUtils.isNotEmpty(gpfk.getFkgx())&&StringUtils.isNotEmpty(curFkVo.getWogylx())&&gpfk.getFkgx().equals(curFkVo.getWogylx())))
+    		if((curFkVo!=null&&gpfk!=null&&StringUtils.isNotEmpty(gpfk.getFkgx())&&StringUtils.isNotEmpty(curFkVo.getWogylxid())&&gpfk.getFkgx().equals(curFkVo.getWogylxid())))
 		{
 			flag =true;
 		}
@@ -1628,7 +1628,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 			if(StringUtils.isEmpty(fkCondition.getWosncode())) {
 				throwReturnMessage("该订单序列号未输入，请重新确认！");
 			}
-			FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
+			FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
 			if(gpfkVo==null) {
 				Gpfk gpfk = new Gpfk();
 				FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
@@ -1659,7 +1659,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 				gpfk.setHgdj(GpfkHgEnum.JYHG.getId());
 				update(gpfk);
 			}
-			FkVO newFkVo =gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
+			FkVO newFkVo =gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
 			newFkVo.setSntype(snType);
 			Wogylx  wogylx = (Wogylx) GavelSql.selectEntityByKey(Wogylx.class, newFkVo.getWogylxid());
 			if(wogylx!=null&&StringUtils.isNotEmpty(wogylx.getGxbz())&&(wogylx.getGxbz().equals("D")||wogylx.getGxbz().equals("M"))) {
@@ -1676,7 +1676,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 			if(StringUtils.isEmpty(fkCondition.getWosncode())) {
 				throwReturnMessage("该订单序列号未输入，请重新确认！");
 			}
-			FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
+			FkVO gpfkVo = gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
 			if(gpfkVo==null) {
 				Gpfk gpfk = new Gpfk();
 				FkVO curFkVo =gpfkDao.queryKwellWoBySnidUptoDate(fkCondition.getWosncode(), fkCondition.getBzgxid());

gavel/src/main/resources/module.xml

@@ -43,12 +43,10 @@
         <menu mkid="1901000600" mkmc="维修反馈" url="kmes/gpwx/index" gnlx="M">
         </menu>
     </menu>
-    <menu mkid="510020000"  mkmc="排产计划">
-			<menu mkid="510020100"  mkmc="排产计划维护" url="kmes/pcjhk/index">
+	<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>
-	</menu>
     <disableMenus>
     	<menu mkid="510050000" mkmc="生产入库"/>
         <menu mkid="290040100" mkmc="生产入库登记"/>