src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -530,7 +530,7 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("该订单还没有上岗"+entity.getOrderNumber());
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 boolean isFinalProcess=finalProcess(workshopDispatchList,list2.get(0).getFbsTechnologicalProcessItemId());
+		 boolean isFinalProcess=finalProcess(workshopDispatchList,list2.get(0).getFbsTechnologicalProcessItemName());
 		 if(!isFinalProcess){
 			 res.setCode("1");
 			 res.setMsg("非最后一道工序不允许报工，只能下岗/暂停！");
@@ -635,7 +635,7 @@ public class FbsWorkingStatisticsController {
 //			 }
 //		 }
 		//判断是否报工、是否最后一道工序
-		 if(entity.getState().equals("1")&&finalProcess(workshopDispatchList,list2.get(0).getFbsTechnologicalProcessItemId())){
+		 if(entity.getState().equals("1")&&finalProcess(workshopDispatchList,list2.get(0).getFbsTechnologicalProcessItemName())){
 			 List<String> idS=new ArrayList<>();
          	//调用SAP接口
 			 JSONObject jsonObjectSAP=saveSAP(entity,workshopDispatchList,idS);
@@ -693,7 +693,7 @@ public class FbsWorkingStatisticsController {
 		 	//判断是否查到工序
 		 	if(fbsTechnologicalProcessItemList!=null&&fbsTechnologicalProcessItemList.size()>0){
 		 		//判断当前报工工艺是否最后一道工艺
-		 		if(fbsTechnologicalProcessItemId.equals(fbsTechnologicalProcessItemList.get(fbsTechnologicalProcessItemList.size()-1).getId())){
+		 		if(fbsTechnologicalProcessItemId.equals(fbsTechnologicalProcessItemList.get(fbsTechnologicalProcessItemList.size()-1).getName())){
 					result=true;
 				}else{
 					result=false;

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -199,7 +199,7 @@
              AND i.cInvCode=#{fbsMomOrderdetail.cinvcode}
          </if>
          <if test="fbsMomOrderdetail.cinvname!=null and fbsMomOrderdetail.cinvname!=''">
-             AND i.cInvName=#{fbsMomOrderdetail.cinvname}
+             AND i.cInvName LIKE "%" #{fbsMomOrderdetail.cinvname} "%"
          </if>
         ORDER BY
         m.createtime DESC
@@ -288,7 +288,7 @@ AND ftp.memo LIKE  "%" #{fbsMomOrderdetail.workCenter} "%"
 AND i.cInvCode=#{fbsMomOrderdetail.cinvcode}
 </if>
 <if test="fbsMomOrderdetail.cinvname!=null and fbsMomOrderdetail.cinvname!=''">
-AND i.cInvName=#{fbsMomOrderdetail.cinvname}
+AND i.cInvName LIKE "%" #{fbsMomOrderdetail.cinvname} "%"
 </if>
 ORDER BY
 m.createtime DESC