Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java

@@ -85,8 +85,8 @@ public class MaterialQuota extends BaseEntity {
 	 * 镀层厚度
 	 */
 	@Schema(description = "镀层厚度")
-	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private BigDecimal thickness;
+//	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private String thickness;
 	/**
 	 * 定额
 	 */
@@ -110,6 +110,7 @@ public class MaterialQuota extends BaseEntity {
 	 * 局部镀定额
 	 */
 	@JsonSerialize(nullsUsing = NullSerializer.class)
+//	@NullSerializer(NullStringSerializer.class)
 	@Schema(description = "局部镀定额")
 	private BigDecimal localBatQuota;
 	/**

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java

@@ -90,5 +90,7 @@ public class LiquidTankTaskVO extends LiquidTankTask {
     private String drugAddUserSign;
     @Schema(description = "控制规范(报告)")
     private String norm;
+    @Schema(description = "槽液到期时间")
+    private LocalDate tankEndTime;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java

@@ -43,6 +43,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -163,7 +164,20 @@ public class MaterialQuotaController extends BladeController {
     @ApiLog(value = "物料定额修改")
     @Operation(summary = "修改一条", description = "传入MaterialQuota Obj")
     public R update(@Valid @RequestBody MaterialQuota updateOne) {
-        return R.status(service.updateById(updateOne));
+        if(null == updateOne.getQuota()){
+            updateOne.setQuota(new BigDecimal(0));
+        }
+        if(null == updateOne.getSmallBatQuota()){
+            updateOne.setSmallBatQuota(new BigDecimal(0));
+        }
+        if(null == updateOne.getBigBatQuota()){
+            updateOne.setBigBatQuota(new BigDecimal(0));
+        }
+        if(null == updateOne.getLocalBatQuota()){
+            updateOne.setLocalBatQuota(new BigDecimal(0));
+        }
+        service.updateById(updateOne);
+        return R.status(true);
     }
 
     /**

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml

@@ -71,7 +71,8 @@
 
     <select id="selectLiquidTankTaskPageByJoin" resultType="org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO">
         SELECT task.*,formula.content as addFormulaContent,formula1.content as afterFormulaContent,
-               worktank.WORK_TANK_CODE as workTankName,good.goods_code as drugMaterialCode
+               worktank.WORK_TANK_CODE as workTankName,good.goods_code as drugMaterialCode,
+               ADD_MONTHS(task.CREATE_TIME, 0) + tank.ANALYSIS_CYCLE as tankEndTime
         FROM QA_LIQUID_TANK_TASK task
                  left join QA_LIQUID_TANK tank on task.LIQUID_TANK_ID = tank.id
                  left join BS_FORMULA formula on tank.ADD_DRUG_FORMULA_ID = formula.id

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@@ -164,7 +164,8 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
     @Override
     public R editDrugBat(List<LiquidTankTask> list) {
         for (LiquidTankTask task : list) {
-            task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_REVIEW);
+//            task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_REVIEW);
+            task = basicChangeTaskStatus(task, LiquidTankTaskConst.S_PENDING_REVIEW);
             basicUpdateById(task);
         }
         return R.success();
@@ -436,6 +437,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
             task.setDrugName(lt.getDrugName());
             task.setDrugMaterialCode(lt.getDrugMaterialCode());
             task.setDrugMaterialName(lt.getDrugMaterialName());
+            task.setDrugMaterialId(lt.getDrugMaterialId());
             task.setFillingLocation(lt.getFillingLocation());
             task.setAnalysisCycle(lt.getAnalysisCycle());
             task.setTestElement(lt.getTestElement());