修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/QualityInspectionManagementController.java

@@ -77,6 +77,15 @@ public class QualityInspectionManagementController {
     public List<PurchasePrice> goodsName(@RequestParam String warehouseId) {
         return qualityInspectionManagementService.goodsName(warehouseId);
     }
+    /**
+     * 出库管理添加质检管理信息
+     *  @param qualityInspectionManagement
+     * @return
+     */
+    @PostMapping("/api/addQualityInspectionOut")
+    public String addQualityInspectionOut(@RequestBody QualityInspectionManagement qualityInspectionManagement) {
+        return qualityInspectionManagementService.addQualityInspectionOut(qualityInspectionManagement);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -10,10 +10,12 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -119,6 +121,8 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
     /**
      * 质检时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date qualityDate;
     /**
      * 状态标识

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IQualityInspectionManagementService.java

@@ -48,4 +48,9 @@ public interface IQualityInspectionManagementService extends IService<QualityIns
      * @return
      */
     List<PurchasePrice> goodsName(String warehouseId);
+    /**
+     * 出库管理添加质检管理信息
+     * @param qualityInspectionManagement
+     */
+    String addQualityInspectionOut(QualityInspectionManagement qualityInspectionManagement);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -178,4 +178,22 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             return "NG";
         }
     }
+    /**
+     * 编辑质检管理信息
+     * @param qualityInspectionManagement
+     * @return
+     */
+    @Override
+    public String addQualityInspectionOut(QualityInspectionManagement qualityInspectionManagement) {
+        //状态改为已质检
+        qualityInspectionManagement.setStatus(StatusEnum.INSPECTED.getName());
+        qualityInspectionManagement.setStatusFlag(StatusEnum.INSPECTED.getFlag());
+        boolean one=this.updateById(qualityInspectionManagement);
+        //成功返回ok
+        if (one ) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/QualityInspectionManagementMapper.xml

@@ -33,8 +33,10 @@
         q.tidal_grain_price as tidalGrainPrice,
         q.water_content as waterContent,
         q.bin_number as binNumber,
+        q.bulk_density as bulkDensity,
         q.storage_tag_no as storageTagNo,
         q.status,
+        q.update_date as updateDate,
         q.quality_date as qualityDate
         FROM quality_inspection_management q
         WHERE
@@ -48,7 +50,7 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND q.warehouse_name= #{warehouseName}
         </if>
-        ORDER BY q.quality_date DESC
+        ORDER BY q.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>