新增修改部分质检信息接口

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -1,17 +1,12 @@
 package org.jeecg.modules.billet.billetOriginalProductRecord.controller;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -37,6 +32,7 @@ import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsend;
 import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
 import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
 import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
+import org.jeecg.modules.billet.billetOriginalProductRecord.dto.BilletOriginalProductRecordEditDTO;
 import org.jeecg.modules.billet.billetOriginalProductRecord.dto.LengthCountQueryDTO;
 import org.jeecg.modules.billet.billetOriginalProductRecord.dto.QualityInspectionQueryDTO;
 import org.jeecg.modules.billet.billetOriginalProductRecord.entity.BilletOriginalProductRecord;
@@ -57,6 +53,14 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * @Description: 钢坯生成原始记录
  * @Author: jeecg-boot
@@ -681,6 +685,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				billetOriginalProductRecord.setSixStrandSum(x.getSixSum());
 				billetOriginalProductRecord.setSevenStrandSum(x.getSevenSum());
 				billetOriginalProductRecord.setEightStrandSum(x.getEightSum());
+				billetOriginalProductRecord.setBrandNum(x.getBrandNum());
 				String totalInfoJson = x.getTotalInfo();
 				if (oConvertUtils.isEmpty(totalInfoJson)){
 					billetOriginalProductRecord.setAmount(0);// 合计
@@ -694,6 +699,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				billetOriginalProductRecord.setStackLength(x.getStacking());
 				billetOriginalProductRecord.setLengthDetails(x.getLength());
 				billetOriginalProductRecord.setCreateTime(DateUtils.str2Date(x.getCreateTime(), DateUtils.datetimeFormat.get()));
+				billetOriginalProductRecord.setDeliveryTime(DateUtils.str2Date(x.getCreateTime(), DateUtils.datetimeFormat.get()));
 				billetOriginalProductRecord.setIsEditCharge("1");
 				billetOriginalProductRecords.add(billetOriginalProductRecord);
 			});
@@ -902,6 +908,44 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		return Result.OK(result);
 	}
 
+	/**
+	 *  修改部分质检信息
+	 *
+	 * @param
+	 * @return
+	 */
+	@AutoLog(value = "修改部分质检信息")
+	@ApiOperation(value="修改部分质检信息", notes="修改部分质检信息")
+	@PutMapping(value = "/updateInfo")
+	public Result<String> updateInfo(@RequestBody BilletOriginalProductRecordEditDTO editDTO) {
+		BilletOriginalProductRecord byId = billetOriginalProductRecordService.getById(editDTO.getOriginalProductRecordId());
+		if (byId == null) {
+			return Result.error("未找到对应数据,编辑失败！");
+		}
+
+		if (oConvertUtils.isEmpty(editDTO.getOriginalProductRecordId())) {
+			return Result.error("原始记录id不能为空！");
+		}
+
+		// 使用 UpdateWrapper 只更新指定字段
+		UpdateWrapper<BilletOriginalProductRecord> updateWrapper = new UpdateWrapper<>();
+		updateWrapper.eq("id", editDTO.getOriginalProductRecordId());
+
+		if (StringUtils.isNotBlank(editDTO.getBrandNum())) {
+			updateWrapper.set("brand_num", editDTO.getBrandNum());
+		}
+		if (editDTO.getDeliveryTime() != null) {
+			updateWrapper.set("delivery_time", editDTO.getDeliveryTime());
+		}
+		if (StringUtils.isNotBlank(editDTO.getNotes())) {
+			updateWrapper.set("notes", editDTO.getNotes());
+		}
+
+		billetOriginalProductRecordService.update(updateWrapper);
+
+		return Result.OK("编辑成功!");
+	}
+
 
 	/**
 	 * 获取当前班次下所有炉次浇筑数据