【微浦MES-EIS 修改接口确认镭雕写入绑定表返回值】

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -2124,7 +2124,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			if (null != err) {
 				return ApiResponse.failRspResult(err);
 			}
-			err = null;
+			err = "";
 			//条码不在维护范围内
 			List<String> sqls = new ArrayList<>();
 			Object maincode = list.get(0).get("sncode");
@@ -2133,14 +2133,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 				if (!rs1.next()) {
 					err += m.get("sncode") + ",";
 				}
-				if(null == err) {
+				if("".equals(err)) {
 					sqls.add("insert into smtbind(SB_ID, SB_MAINCODE, SB_BARCODE, SB_PRODCODE, SB_INMAN, SB_INDATE, SB_STATUS, SB_MAKECODE)" +
 							" values (smtbind_seq.nextval,'" + maincode + "','" + m.get("sncode") + "','" + rs.getString("ma_prodcode") + "','接口',sysdate,0,'" + macode + "')");
 					sqls.add("update MAKESNRULEDETAIL set msd_isget=-1,msd_getdate=sysdate where msd_makecode='" + macode + "' and msd_sncode='"+m.get("sncode")+"' and nvl(msd_isget,0)=0 and msd_type='before'");
 					sqls.add("update MAKESNRULEDETAIL set msd_isconfirm=-1,msd_confirmdate=sysdate where msd_makecode='" + macode + "' and msd_sncode='"+m.get("sncode")+"' and msd_type='before' ");;
 				}
 			}
-			if (null != err) {
+			if (!"".equals(err)) {
 				return ApiResponse.failRspResult("条码："+err.substring(0, err.length() - 1)+"，不在工单维护的镭雕条码范围内！");
 			}else{
 				baseDao.execute(sqls);