Merge remote-tracking branch 'origin/master'

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/MesController.java

@@ -756,17 +756,16 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         if (null != qualityInfo || null!=mesInfo) {
             //处理质检任务信息
             JSONObject dataInfo = (qualityInfo!=null)? qualityInfo : mesInfo;
-            processNo = dataInfo.getString("afonr");
-            workOrderNo = dataInfo.getString("auidnr");
-            String batchNo = dataInfo.getString("batchno");
-            String serialNo = dataInfo.getString("sno");
-            String drawingNo = dataInfo.getString("graphno");
-            String idnr = dataInfo.getString("idnr");
-
+            processNo = (qualityInfo!=null)?dataInfo.getString("ProcessCode"):dataInfo.getString("afonr");
+            workOrderNo = (qualityInfo!=null)?dataInfo.getString("TaskCode"):dataInfo.getString("auidnr");
+            String batchNo = (qualityInfo!=null)?dataInfo.getString("BatchNo"):dataInfo.getString("batchno");
+            String serialNo = (qualityInfo!=null)?dataInfo.getString("PartOrder"):dataInfo.getString("sno");
+            String drawingNo = (qualityInfo!=null)?dataInfo.getString("DrawNumber"):dataInfo.getString("graphno");
+            String idnr = (qualityInfo!=null)?null :dataInfo.getString("idnr");
 
             //获取默认虚拟原材料
             mMeterial = materialService.getById(1L);
-            MMeterialReceiveLog mMeterialReceiveLog = meterialReceiveLogService.getById(1L);
+            //MMeterialReceiveLog mMeterialReceiveLog = meterialReceiveLogService.getById(1L);
             materialCode = StringUtil.isNotEmpty(idnr)? idnr: mMeterial.getMeterialCode();
             BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getDrawingNo, drawingNo).eq(BBom::getSynFlag, "1"));
             if(bom==null){