修改

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

@@ -1,9 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
+import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -17,5 +19,38 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/weighingManagement")
 public class WeighingManagementController {
 
+    @Autowired
+    private IWeighingManagementService weighingManagementService;
+
+    /**
+     * 检斤管理列表
+     * @param weighingManagement
+     * @return
+     */
+    @GetMapping("/selectWeighingManagement")
+    public Page<WeighingManagement> selectWeighingManagement(WeighingManagement weighingManagement) {
+        return weighingManagementService.selectWeighingManagement(weighingManagement);
+    }
+
+    /**
+     * 毛重检斤
+     * @param weighingManagement
+     * @return
+     */
+    @PostMapping("/api/editGrossWeight")
+    public String editGrossWeight(@RequestBody WeighingManagement weighingManagement){
+        return weighingManagementService.editGrossWeight(weighingManagement);
+    }
+
+    /**
+     * 皮重检斤
+     * @param weighingManagement
+     * @return
+     */
+    @PostMapping("/api/editTare")
+    public String editTare(@RequestBody WeighingManagement weighingManagement){
+        return weighingManagementService.editTare(weighingManagement);
+    }
+
 }
 

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

@@ -4,6 +4,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
@@ -168,6 +169,17 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     private String tared;
 
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WeighingManagementMapper.java

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.SalePlanInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 检斤管理 Mapper 接口
@@ -13,4 +17,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface WeighingManagementMapper extends BaseMapper<WeighingManagement> {
 
+    /**
+     * 根据条件查询检斤管理总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询检斤管理列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<WeighingManagement> getListByCondition(Map<String, Object> pageView);
 }

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

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -13,4 +14,23 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface IWeighingManagementService extends IService<WeighingManagement> {
 
+    /**
+     * 检斤管理列表
+     * @param weighingManagement
+     * @return
+     */
+    Page<WeighingManagement> selectWeighingManagement(WeighingManagement weighingManagement);
+    /**
+     * 毛重检斤
+     * @param weighingManagement
+     */
+    String editGrossWeight(WeighingManagement weighingManagement);
+    /**
+     * 皮重检斤
+     * @param weighingManagement
+     */
+    String editTare(WeighingManagement weighingManagement);
+
+
+
 }

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

@@ -1,10 +1,18 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WeighingManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +25,68 @@ import org.springframework.stereotype.Service;
 @Service
 public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagementMapper, WeighingManagement> implements IWeighingManagementService {
 
+    /**
+     * 检斤管理列表
+     * @param weighingManagement
+     * @return
+     */
+    @Override
+    public Page<WeighingManagement> selectWeighingManagement(WeighingManagement weighingManagement) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (weighingManagement.getCurrentPage() - 1)
+                * weighingManagement.getPageSize());
+        //公司id
+        pageView.put("compId",weighingManagement.getCompId());
+        pageView.put("searchKeyWord",weighingManagement.getSearchKeyWord());
+        pageView.put("pageSize",weighingManagement.getPageSize());
+        pageView.put("currentPage",weighingManagement.getCurrentPage());
+        // 查询销售订单总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<WeighingManagement> dataList = baseMapper.getListByCondition(pageView);
+        Page<WeighingManagement> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(weighingManagement.getCurrentPage());
+        page.setSize(weighingManagement.getPageSize());
+        return page;
+    }
+
+    /**
+     * 毛重检斤
+     * @param weighingManagement
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String editGrossWeight(WeighingManagement weighingManagement) {
+        //状态改为已称毛重
+        weighingManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
+        weighingManagement.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
+        boolean one = this.updateById(weighingManagement);
+        if (one) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+
+    /**
+     * 皮重检斤
+     * @param weighingManagement
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String editTare(WeighingManagement weighingManagement) {
+        //状态改为已称皮重
+        weighingManagement.setStatus(StatusEnum.TARED.getName());
+        weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());
+        boolean one = this.updateById(weighingManagement);
+        if (one) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+
 }

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

@@ -1,5 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.WeighingManagementMapper">
-
+    <!-- 获得检斤管理总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM weighing_management
+        WHERE delete_flag = '0'
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(customer) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(car_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+        </if>
+    </select>
+    <!-- 获得检斤管理列表 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement">
+        SELECT
+        id,
+        number,
+        customer,
+        car_number as carNumber,
+        goods_name as goodsName,
+        gross_weight as grossWeight,
+        tare,
+        bin_number as binNumber,
+        storage_number as storageNumber,
+        secretary_weigher as secretaryWeigher,
+        gross_date as grossDate,
+        tare_date as tareDate,
+        status,
+        status_flag as statusFlag
+        FROM weighing_management
+        WHERE delete_flag = '0'
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(customer) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(car_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+        </if>
+        ORDER BY update_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>