外部报验-修改/提交

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxOutsideInspectionItpService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpDo;
 import com.rongwei.bsentity.dto.OutsideInspactionSyncReqquest;
 import com.rongwei.bsentity.dto.ReInspectionRequest;
+import com.rongwei.bsentity.dto.outside.OutsideInspectionInsertRequest;
+import com.rongwei.bsentity.dto.outside.OutsideInspectionUpdateRequest;
 import com.rongwei.bsentity.vo.OperOutsideInspectionVo;
 import com.rongwei.bsentity.vo.ZhcxOutsideExportVo;
 import com.rongwei.rwcommon.base.R;
@@ -15,6 +17,20 @@ import java.util.List;
 
 public interface ZhcxOutsideInspectionItpService extends IService<ZhcxOutsideInspectionItpDo> {
 
+    /**
+     * 保存外部报验单
+     *
+     * @param req
+     */
+    void insertInspection(OutsideInspectionInsertRequest req);
+
+    /**
+     * 修改外部报验单
+     *
+     * @param req
+     */
+    void updateInspection(OutsideInspectionUpdateRequest req);
+
     /**
      * 拆单
      *

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -17,6 +17,8 @@ import com.rongwei.bsentity.domain.*;
 import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpDao;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bsentity.dto.*;
+import com.rongwei.bsentity.dto.outside.OutsideInspectionInsertRequest;
+import com.rongwei.bsentity.dto.outside.OutsideInspectionUpdateRequest;
 import com.rongwei.bsentity.vo.*;
 import com.rongwei.commonservice.serial.service.SysSerialNumberService;
 import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
@@ -95,6 +97,58 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
     @Autowired
     private ZhcxItpProjectNodesService itpProjectNodesService;
 
+    /**
+     * 保存外部报验单
+     *
+     * @param req
+     */
+    @Override
+    public void insertInspection(OutsideInspectionInsertRequest req) {
+
+        //保存单据
+        try {
+            sysGeneralCRUDService.generalMsInsert(req.getInsert());
+        } catch (Exception e) {
+            log.error("保存失败: {}", e);
+            throw new CustomException("保存失败");
+        }
+        //拆分
+        splitOrder(req.getId());
+    }
+
+    /**
+     * 修改外部报验单
+     *
+     * @param req
+     */
+    @Override
+    public void updateInspection(OutsideInspectionUpdateRequest req) {
+        //修改操作
+        if(ObjectUtil.isEmpty(req.getOperType()) || "updateInspection".equals(req.getOperType())) {
+            ZhcxOutsideInspectionItpDo itpDo = this.getById(req.getId()); //报验单
+
+            //报验单中编码不存在，为首次提交，不需要生成修改记录
+            if(ObjectUtil.isNotEmpty(itpDo.getInspectioncode())) {
+                saveEditHistory(itpDo, req.getUpdate()); //保存历史记录
+            }
+
+            //保存单据
+            try {
+                sysGeneralCRUDService.generalMsUpdate(req.getUpdate());
+            } catch (Exception e) {
+                log.error("保存失败: {}", e);
+                throw new CustomException("保存失败");
+            }
+
+            //单个报验点保存后操作
+            saveSingle(itpDo);
+        }
+        //重新报验
+        else if("reInspection".equals(req.getOperType())) {
+            reInspection(req.getId(), req.getUpdate());
+        }
+    }
+
     /**
      * 拆单
      *

business-entity/src/main/java/com/rongwei/bsentity/dto/outside/OutsideInspectionInsertRequest.java

@@ -0,0 +1,22 @@
+package com.rongwei.bsentity.dto.outside;
+
+import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
+import lombok.*;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OutsideInspectionInsertRequest {
+
+    /**
+     * 报验单id
+     */
+    private String id;
+
+    /**
+     * 保存数据
+     */
+    private MasterSlaveInsertVo insert;
+}

business-entity/src/main/java/com/rongwei/bsentity/dto/outside/OutsideInspectionUpdateRequest.java

@@ -0,0 +1,29 @@
+package com.rongwei.bsentity.dto.outside;
+
+import com.rongwei.rwcommon.vo.generalsql.MasterSlaveUpdateVo;
+import lombok.*;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OutsideInspectionUpdateRequest {
+
+    /**
+     * 报验单id
+     */
+    private String id;
+
+    /**
+     * 保存数据
+     */
+    private MasterSlaveUpdateVo update;
+
+    /**
+     * 操作类型，值为空的时候默认修改
+     * reInspection 重新报验
+     * updateInspection 修改
+     */
+    private String operType;
+}

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxOutsideInspectionItpController.java

@@ -4,6 +4,8 @@ package com.rongwei.bsserver.controller;
 import com.rongwei.bscommon.sys.service.ZhcxOutsideInspectionItpService;
 import com.rongwei.bscommon.sys.service.ZhcxReprotSameDayRealTimeInspectionStatisticsService;
 import com.rongwei.bsentity.dto.ReInspectionRequest;
+import com.rongwei.bsentity.dto.outside.OutsideInspectionInsertRequest;
+import com.rongwei.bsentity.dto.outside.OutsideInspectionUpdateRequest;
 import com.rongwei.rwcommon.base.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -66,5 +68,29 @@ public class ZhcxOutsideInspectionItpController {
         return R.ok();
     }
 
+    /**
+     * 保存
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/insertInspection")
+    public R insertInspection(@RequestBody OutsideInspectionInsertRequest req){
+        service.insertInspection(req);
+        return R.ok();
+    }
+
+    /**
+     * 修改/重新报验
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/updateInspection")
+    public R updateInspection(@RequestBody OutsideInspectionUpdateRequest req){
+        service.updateInspection(req);
+        return R.ok();
+    }
+
 }