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

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

@@ -371,7 +371,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append("         left join BM on BM_ID = WO_BMID ");
         sqlMap.append("         left join WLXX on WLXX_ID = WO_WLID ");
         sqlMap.append("         left join (select GPFK_FKGX, GPFK_WOSNID, BZGX_NAME,GZZX_ID,GZZX_NAME,GPFK_FKR,GPFK_FKSJ,BX_ID,BX_NAME from GPFK A  ");
-        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("                    left join GZZX on GZZX_ID = BZGX_GZZXID  ");
         sqlMap.append("                    left join BX on BX_ID = GPFK_FKBX  ");
         sqlMap.append("                    where GPFK_FKSJ = (select max(GPFK_FKSJ) as fksj  ");
@@ -1224,7 +1225,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
 	        sqlMap.append("  left join GYLX on GYLX_ID = WOGYLX_GYLXID");
 	        sqlMap.append("  left join BZGX on BZGX_ID =GYLX_BZGXID");
 	        sqlMap.append("  left join WLXX on wlxx_id = wo_wlid");
-	        sqlMap.append("  left join GPFK on GPFK_WOSNID = WOSN_CODE");
+	        sqlMap.append("  left join GPFK on GPFK_WOSNID = WOSN_CODE and GPFK_FKGX=WOGYLX_ID ");
 	        sqlMap.append("where 1 = 1 ");
 	        sqlMap.append("  and WOSN_CODE = :pSNID ");
 	        sqlMap.setParamValue("pSNID",snid);

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

@@ -1088,7 +1088,6 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 			if(StringUtils.isNotEmpty(curFkVo.getId())) {
 				curFkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(fkCondition);
 			}
-			curFkVo.setSntype(snType);
 			return curFkVo;
 		}
 		else if(snType.equals(SmCodeEnum.OKBZ.getId())) {

gavel/src/main/resources/templates/views/kmes/gphy/zpindex.html

@@ -200,7 +200,7 @@
 					}
 					var data=DataBind.collectData(element);
 					$div.find("input[name='bxid']").val(data.bxid||"");
-					$div.find("input[name='bzgxid']").val(data.id||"");
+					$div.find("input[name='bzgxid']").val(data.gxid||"");
 					$div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId'));
 					fkrName=window.sessionStorage.getItem('userName');
 					gxName=data.gxName||"";

gavel/src/main/resources/templates/views/kmes/gpjy/jyindex.html

@@ -38,7 +38,7 @@
 								</div>
 								<!--<input type="hidden" name="bxid"/>-->
 								<input type="hidden" name="fkrid"/>
-								<input type="hidden" name="gxid"/>
+								<input type="hidden" name="bzgxid"/>
 							</li>
 						</ul>
 						<span class="toolbar-search-span"><a class="toolbar-search1" style="color: white" href="javascript:void(0)"></a></span>
@@ -121,7 +121,7 @@
 				},
 				messager:function () {
 					var flag=true;
-					if($div.find("input[name='gxid']").val()==""){
+					if($div.find("input[name='bzgxid']").val()==""){
 						gas.confirm("您尚未选择工序,无法进行反馈操作。是否重新选择工序？",function () {
 							run();
 							flag=false;
@@ -171,7 +171,7 @@
 			iconCls:"fa fa-search",
 			btnCls:"",
 			onClick:function () {
-				if($div.find("input[name='gxid']").val()==""){
+				if($div.find("input[name='bzgxid']").val()==""){
 					gas.confirm("您尚未选择工序。是否重新选择工序？",function () {
 						run();
 					});
@@ -202,7 +202,7 @@
 				}
 				var data=DataBind.collectData(element);
 				$div.find("input[name='bxid']").val(data.bxid||"");
-				$div.find("input[name='gxid']").val(data.gxid||"");
+				$div.find("input[name='bzgxid']").val(data.gxid||"");
 				$div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId'));
 				fkrName=window.sessionStorage.getItem('userName');
 				gxName=data.gxName||"";

gavel/src/main/resources/templates/views/kmes/gpwx/wxindex.html

@@ -38,7 +38,7 @@
 								</div>
 							<!--	<input type="hidden" name="bxid"/>-->
 								<input type="hidden" name="fkrid"/>
-								<input type="hidden" name="gxid"/>
+								<input type="hidden" name="bzgxid"/>
 							</li>
 						</ul>
 						<span class="toolbar-search-span"><a class="toolbar-search1" style="color: white" href="javascript:void(0)"></a></span>
@@ -116,7 +116,7 @@
 				},
 				messager:function () {
 					var flag=true;
-					if($div.find("input[name='gxid']").val()==""){
+					if($div.find("input[name='bzgxid']").val()==""){
 						gas.confirm("您尚未选择工序,无法进行反馈操作。是否重新选择工序？",function () {
 							run();
 							flag=false;
@@ -164,7 +164,7 @@
 			iconCls:"fa fa-search",
 			btnCls:"",
 			onClick:function () {
-				if($div.find("input[name='gxid']").val()==""){
+				if($div.find("input[name='bzgxid']").val()==""){
 					gas.confirm("您尚未选择工序，是否重新选择工序？",function () {
 						run();
 					});
@@ -199,7 +199,7 @@
 					}
 					var data=DataBind.collectData(element);
 					$div.find("input[name='bxid']").val(data.bxid||"");
-					$div.find("input[name='gxid']").val(data.gxid||"");
+					$div.find("input[name='bzgxid']").val(data.gxid||"");
 					$div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId'));
 					fkrName=window.sessionStorage.getItem('userName');
 					gxName=data.gxName||"";