lims-ruoyi-after.git

			@@ -7,6 +7,7 @@
			import cn.hutool.core.date.DateUtil;
			import cn.hutool.core.io.IoUtil;
			import cn.hutool.core.util.StrUtil;
			import cn.hutool.json.JSONUtil;
			import com.alibaba.excel.EasyExcel;
			import com.alibaba.excel.ExcelWriter;
			import com.alibaba.excel.support.ExcelTypeEnum;
			@@ -27,6 +28,7 @@
			import com.ruoyi.common.constant.InsOrderTypeConstants;
			import com.ruoyi.common.core.domain.Result;
			import com.ruoyi.common.core.domain.entity.User;
			import com.ruoyi.common.enums.ContractType;
			import com.ruoyi.common.enums.OrderType;
			import com.ruoyi.common.numgen.NumberGenerator;
			import com.ruoyi.common.utils.LimsDateUtil;
			@@ -35,10 +37,7 @@
			import com.ruoyi.common.utils.WxCpUtils;
			import com.ruoyi.common.utils.api.IfsApiUtils;
			import com.ruoyi.framework.exception.ErrorException;
			import com.ruoyi.inspect.dto.CopperInsOrderDto;
			import com.ruoyi.inspect.dto.OrderSplitDTO;
			import com.ruoyi.inspect.dto.RawMaterialStandardTreeDto;
			import com.ruoyi.inspect.dto.SampleProductDto;
			import com.ruoyi.inspect.dto.*;
			import com.ruoyi.inspect.excel.OrderSplitExcelData;
			import com.ruoyi.inspect.excel.OrderSplitExcelListener;
			import com.ruoyi.inspect.mapper.InsOrderMapper;
			@@ -101,8 +100,6 @@
			private IfsApiUtils ifsApiUtils;

			private IfsSplitOrderRecordService ifsSplitOrderRecordService;

			private InsUnqualifiedHandlerMapper insUnqualifiedHandlerMapper;

			private final NumberGenerator<IfsSplitOrderRecord> splitOrderRecordNumberGenerator;

			@@ -895,7 +892,7 @@
			inAttrMap.put("BATCH_INFO", batchInfoData);
			String inAttr = JSONObject.toJSONString(inAttrMap);
			//调用ifs接口
			Result result = ifsApiUtils.updateMoveReceiptLot(inAttr);
			Result result = ifsApiUtils.updateMoveReceiptLot(ifsInventoryQuantity.getContract(),inAttr);
			if(result.getCode()!=200){
			throw new RuntimeException("IFS采购接收更改批号请求异常："+result.getMessage());
			}
			@@ -917,7 +914,7 @@
			}
			//ifs更改批号接口调用成功，拉取新拆分的ifs订单并报检
			Map<String, Object> map = new HashMap<>();
			map.put("LOCATION_NO","1302");
			// map.put("LOCATION_NO","1302");
			map.put("STATE_DB","To be Inspected");
			map.put("PART_NO",ifsInventoryQuantity.getPartNo());
			map.put("ORDER_NO",ifsInventoryQuantity.getOrderNo());