合并

zss

2023-08-15 56f89b4a45a561ff017ffd1e611e542130d046a0

合并

 inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java

@@ -40,7 +40,7 @@
            @ApiImplicitParam(name = "formTime", value = "来料日期", dataTypeClass = String.class),
            @ApiImplicitParam(name = "createTime", value = "报检日期", dataTypeClass = String.class),
            @ApiImplicitParam(name = "insState", value = "检测状态: å…¨éƒ¨é»˜è®¤2", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "judgeState", value = "合格状态: å…¨éƒ¨é»˜è®¤2", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "judgeState", value = "合格状态: å…¨éƒ¨é»˜è®¤2", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/selectRawInspectsList")
    public Result selectRawInspectsList(Integer pageSize, Integer countSize, String formTime, String createTime, Integer insState, Integer judgeState) {

 inspect-server/src/main/java/com/yuanchu/mom/controller/ResportController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package com.yuanchu.mom.controller;


import com.yuanchu.mom.pojo.StatisticsData;
import com.yuanchu.mom.service.ResportService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.time.LocalDate;


@RestController
@RequestMapping("/resport")
@Api(tags = "QMS管理-->质量统计")
public class ResportController {

    @Resource
    ResportService resportService;


    @ApiOperation("计算合格与不合格数量接口")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "begin", value = "统计开始日期", dataTypeClass = String.class, required = true),
            @ApiImplicitParam(name = "end", value = "统计结束日期", dataTypeClass = String.class, required = true)
    })
    @GetMapping("/qualifiedStatistics")
    public Result turno(String begin, String end) {
        StatisticsData statisticsData=resportService.turno(begin,end);
        return Result.success(statisticsData);
    }

    @ApiOperation("计算产品数量接口")
    @GetMapping("/allNum")
    public Result allNum() {
        return Result.success(resportService.allNum());
    }

    @ApiOperation("计算产品达标数量接口")
    @GetMapping("/statisNum")
    public Result statisNum() {
        return Result.success(resportService.statisNum());
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java

@@ -5,6 +5,7 @@
import com.yuanchu.mom.pojo.FinishedInspect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.time.LocalDate;
import java.util.Map;

/**
@@ -18,4 +19,10 @@
public interface FinishedInspectMapper extends BaseMapper<FinishedInspect> {

    IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);

    //计算成品或者过程检验在某一个时间段的合格数
    Integer selCountFin(String begin, String end, int type,int result);

    //计算月产量
    Long seAllCount(String begin, String end, int type);
}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java

@@ -3,6 +3,7 @@
import com.yuanchu.mom.pojo.RawInspect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.time.LocalDate;
import java.util.List;

/**
@@ -16,6 +17,11 @@
    List<RawInspect> selectRawInspectsByLimit(int pageSize, int countSize, String formTime, String createTime,int insState,int judgeState);


    //计算原材料在某个范围内的合格或不合格数量
    Integer selCountRaw(String begin, String end,Integer judgeState);

    //计算月总产量
    Long seAllCount(String begin, String end);
}



 inspect-server/src/main/java/com/yuanchu/mom/pojo/ProReport.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.yuanchu.mom.pojo;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ProReport implements Serializable {

    //日期，以逗号分隔，例如：2022-10-01,2022-10-02,2022-10-03
    private String dateList;

    //成品总量，以逗号分隔，例如：200,210,220
    private String finishedList;

    //过程总量，以逗号分隔，例如：20,21,10
    private String processList;

    //原材料总量，以逗号分隔，例如：20,21,10
    private String materialList;

}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/StatisticsData.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.yuanchu.mom.pojo;


import lombok.Data;

@Data
public class StatisticsData {
  private int material;  //原材料合格
  private int process;   //过程合格
  private int finished;  //成品合格
  private int unmaterial;  //原材料不合格
  private int unprocess;   //过程不合格
  private int unfinished;  //成品不合格



}

 inspect-server/src/main/java/com/yuanchu/mom/service/ResportService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.yuanchu.mom.service;

import com.yuanchu.mom.pojo.StatisticsData;
import com.yuanchu.mom.pojo.ProReport;

public interface ResportService {

    /**
     * è®¡ç®—合格与不合格数量
     * @param begin
     * @param end
     * @return
     */
    StatisticsData turno(String begin, String end);

    /**
     * è®¡ç®—产品总量
     * @return
     */
    ProReport allNum();

    /**
     * è®¡ç®—达标总量
     * @return
     */
    ProReport statisNum();

}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/ResportServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,144 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.mapper.FinishedInspectMapper;
import com.yuanchu.mom.mapper.RawInspectMapper;
import com.yuanchu.mom.pojo.ProReport;
import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.pojo.StatisticsData;
import com.yuanchu.mom.service.ResportService;
import lombok.Data;
import org.apache.tomcat.util.buf.StringUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;


@Service
public class ResportServiceImpl implements ResportService {

    @Resource
    RawInspectMapper rawInspectMapper;

    @Resource
    FinishedInspectMapper finishedInspectMapper;

    //计算合格与不合格数量
    @Override
    public StatisticsData turno(String begin, String end) {
        StatisticsData statisticsData = new StatisticsData();
        //原材料合格
        Integer material = rawInspectMapper.selCountRaw(begin, end, 1);
        statisticsData.setMaterial(material);
        //原材料不合格
        Integer unmaterial = rawInspectMapper.selCountRaw(begin, end, 0);
        statisticsData.setUnmaterial(unmaterial);
        //过程合格数
        Integer process = finishedInspectMapper.selCountFin(begin, end, 1, 1);
        statisticsData.setProcess(process);
        //过程不合格
        Integer unprocess = finishedInspectMapper.selCountFin(begin, end, 1, 0);
        statisticsData.setUnprocess(unprocess);
        //成品合格数
        Integer finished = finishedInspectMapper.selCountFin(begin, end, 0, 1);
        statisticsData.setFinished(finished);
        //成品不合格
        Integer unfinished = finishedInspectMapper.selCountFin(begin, end, 0, 0);
        statisticsData.setUnfinished(unfinished);
        return statisticsData;
    }

    //计算产品总量
    @Override
    public ProReport allNum() {
        // èŽ·å–当前日期的前两个月的日期
        ArrayList<String> dateList = new ArrayList<>();
        LocalDate now = LocalDate.now();
        LocalDate oneAgo = now.minusMonths(1);
        LocalDate twoAgo = now.minusMonths(2);
        // æ ¼å¼åŒ–日期对象
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
        dateList.add(twoAgo.format(formatter));
        dateList.add(oneAgo.format(formatter));
        dateList.add(now.format(formatter));
        //获取原材料月产量
        Long cLong = rawInspectMapper.seAllCount(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString());
        Long bLong = rawInspectMapper.seAllCount(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString());
        Long aLong = rawInspectMapper.seAllCount(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString());
        ArrayList<String> materialList = new ArrayList<>();
        materialList.add(aLong.toString());
        materialList.add(bLong.toString());
        materialList.add(cLong.toString());
        //获取过程月产量
        Long c1Long = finishedInspectMapper.seAllCount(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
        Long b1Long = finishedInspectMapper.seAllCount(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
        Long a1Long = finishedInspectMapper.seAllCount(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
        ArrayList<String> processList = new ArrayList<>();
        processList.add(a1Long.toString());
        processList.add(b1Long.toString());
        processList.add(c1Long.toString());
        //获取成品月产量
        Long c2Long = finishedInspectMapper.seAllCount(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0);
        Long b2Long = finishedInspectMapper.seAllCount(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0);
        Long a2Long = finishedInspectMapper.seAllCount(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0);
        ArrayList<String> finishedList = new ArrayList<>();
        finishedList.add(a2Long.toString());
        finishedList.add(b2Long.toString());
        finishedList.add(c2Long.toString());
        return ProReport.builder()
                .dateList(StringUtils.join(dateList, ','))
                .materialList(StringUtils.join(materialList, ','))
                .processList(StringUtils.join(processList, ','))
                .finishedList(StringUtils.join(finishedList, ','))
                .build();
    }

    //计算达标总量
    @Override
    public ProReport statisNum() {
        // èŽ·å–当前日期的前两个月的日期
        ArrayList<String> dateList = new ArrayList<>();
        LocalDate now = LocalDate.now();
        LocalDate oneAgo = now.minusMonths(1);
        LocalDate twoAgo = now.minusMonths(2);
        // æ ¼å¼åŒ–日期对象
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
        dateList.add(twoAgo.format(formatter));
        dateList.add(oneAgo.format(formatter));
        dateList.add(now.format(formatter));
        //获取原材料月达标产量
        Integer c = rawInspectMapper.selCountRaw(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
        Integer b = rawInspectMapper.selCountRaw(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
        Integer a = rawInspectMapper.selCountRaw(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
        ArrayList<String> materialList = new ArrayList<>();
        materialList.add(a.toString());
        materialList.add(b.toString());
        materialList.add(c.toString());
        //获取过程月达标产量
        Integer c1 = finishedInspectMapper.selCountFin(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1, 1);
        Integer b1 = finishedInspectMapper.selCountFin(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1, 1);
        Integer a1 = finishedInspectMapper.selCountFin(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1, 1);
        ArrayList<String> processList = new ArrayList<>();
        processList.add(a1.toString());
        processList.add(b1.toString());
        processList.add(c1.toString());
        //获取成品月达标产量
        Integer c2 = finishedInspectMapper.selCountFin(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0, 1);
        Integer b2 = finishedInspectMapper.selCountFin(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0, 1);
        Integer a2 = finishedInspectMapper.selCountFin(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0, 1);
        ArrayList<String> finishedList = new ArrayList<>();
        finishedList.add(a2.toString());
        finishedList.add(b2.toString());
        finishedList.add(c2.toString());
        return ProReport.builder()
                .dateList(StringUtils.join(dateList, ','))
                .materialList(StringUtils.join(materialList, ','))
                .processList(StringUtils.join(processList, ','))
                .finishedList(StringUtils.join(finishedList, ','))
                .build();
    }
}

 inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml

@@ -1,9 +1,9 @@
<?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.yuanchu.mom.mapper.FinishedInspectMapper">

    <select id="selectFinishedInspectPage" resultType="map">
        SELECT f.`id`, f.`order_number`, f.`customer_name`, f.`project_name`, f.`quality_traceability`, f.`material_code`, f.`material`, f.`specifications_model`, f.`unit`,
        SELECT f.`id`, f.`order_number`, f.`customer_name`, f.`project_name`, f.`quality_traceability`,
        f.`material_code`, f.`material`, f.`specifications_model`, f.`unit`,
               f.`quantity`, u.`name`, DATE_FORMAT(f.`create_time`, '%Y-%m-%d') detectionPeriod, f.`result`
        FROM finished_inspect f, `user` u
        WHERE f.`user_id` = u.`id`
@@ -18,4 +18,29 @@
                AND u.`name` LIKE CONCAT('%',#{inspectUsername},'%')
            </if>
    </select>
    <select id="selCountFin" resultType="java.lang.Integer">
        select count(id)
        from mom_ocean.finished_inspect
        where state=1
        and result=#{result}
        and type=#{type}
        <if test="begin != null and begin!=''">
            and finished_inspect.create_time &gt;= #{begin}
        </if>
        <if test="end != null and end!=''">
            and finished_inspect.create_time &lt;= #{end}
        </if>
    </select>
    <select id="seAllCount" resultType="java.lang.Long">
        select count(id)
        from mom_ocean.finished_inspect
        where state=1
        and type=#{type}
        <if test="begin != null and begin!=''">
            and finished_inspect.create_time &gt;= #{begin}
        </if>
        <if test="end != null and end!=''">
            and finished_inspect.create_time &lt;= #{end}
        </if>
    </select>
</mapper>

 inspect-server/src/main/resources/mapper/RawInspectMapper.xml

@@ -39,4 +39,28 @@
        order by id desc
        limit #{pageSize},#{countSize}
    </select>
    <select id="selCountRaw" resultType="java.lang.Integer">
        select count(id)
        from mom_ocean.raw_inspect
        where state=1
        and ins_state=1
        and judge_state=#{judgeState}
        <if test="begin != null and begin!=''">
            and raw_inspect.create_time &gt;= #{begin}
        </if>
        <if test="end != null and end!=''">
            and raw_inspect.create_time &lt;= #{end}
        </if>
    </select>
    <select id="seAllCount" resultType="java.lang.Long">
        select count(id)
        from mom_ocean.raw_inspect
        where state=1
        <if test="begin != null and begin!=''">
            and raw_inspect.create_time &gt;= #{begin}
        </if>
        <if test="end != null and end!=''">
            and raw_inspect.create_time &lt;= #{end}
        </if>
    </select>
</mapper>

 inspect-server/src/test/java/com/yuanchu/mom/InspectServerApplicationTests.java

@@ -1,7 +1,10 @@
package com.yuanchu.mom;


import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;



@SpringBootTest
class InspectServerApplicationTests {
@@ -9,5 +12,5 @@
    @Test
    void contextLoads() {
    }

}


 inventory-server/pom.xml

@@ -31,12 +31,6 @@
            <version>0.0.1-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>sale-server</artifactId>
            <version>1.0.0</version>
        </dependency>

        <!--工具模块-->
        <dependency>
            <groupId>com.yuanchu.mom</groupId>

 inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java

ÎļþÃû´Ó standard-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java ÐÞ¸Ä
@@ -38,7 +38,7 @@
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "orderCode", value = "订单编号", dataTypeClass = String.class),
            @ApiImplicitParam(name = "name", value = "产品名称", dataTypeClass = String.class),
            @ApiImplicitParam(name = "state", value = "状态(为空=全部)", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "state", value = "编制状态(为空=全部)", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "time", value = "下单时间", dataTypeClass = String.class)
    })
    @GetMapping("/selectAllOrder")
@@ -48,15 +48,6 @@
        map.put("total", inspectionPage.getTotal());
        map.put("row", inspectionPage.getRecords());
        return Result.success(map);
    }

    @ApiOperation("根据订单id查询订单详情")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "订单id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/selectOrderById")
    public Result selectOrderById(Integer id) {
        return Result.success(ordersService.getById(id));
    }

}

 inventory-server/src/main/java/com/yuanchu/mom/controller/ReceiptController.java

@@ -89,7 +89,7 @@
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "回单id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/selReceDatil")
    @GetMapping("/selReceDatil")
    public ResponseEntity<byte[]> selReceDatil(Integer id) throws IOException {
        return receiptService.selReceDatil(id);
    }

 inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java

ÎļþÃû´Ó sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java ÐÞ¸Ä
@@ -3,10 +3,9 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.dto.vo.SaleVo;
import com.yuanchu.mom.pojo.vo.SaleVo;
import com.yuanchu.mom.service.RepertoryService;
import com.yuanchu.mom.utils.JackSonUtil;
import org.json.JSONException;
import org.json.JSONObject;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.service.SaleService;
import com.yuanchu.mom.utils.Jwt;
@@ -18,7 +17,6 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.lang.reflect.Array;
import java.util.*;

/**
@@ -40,6 +38,9 @@
    @Resource
    Jwt jwt;

    @Resource
    RepertoryService repertoryService;

    @ApiOperation(value = "查询销售单列表")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
@@ -58,6 +59,12 @@
        return Result.success(map);
    }

    @ApiOperation(value = "新增销售单-->添加产品-->查询成品库存")
    @PostMapping("/seleRepe")
    public Result seleRepe() {
        return Result.success(repertoryService.getSale());
    }

    @ApiOperation(value = "新增销售单")
    @PostMapping("/addSale")
    public Result addSale(@RequestHeader("token") String token, @RequestBody SaleDto saleDto) throws Exception {

 inventory-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java

 inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java

@@ -6,6 +6,7 @@
import com.yuanchu.mom.pojo.Repertory;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

/**
@@ -18,5 +19,9 @@

    //查询所有库存列表
    IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState);

    //查询库存三个字段给添加销售单
    List<Map<String, Object>> getSale();

}


 inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java

ÎļþÃû´Ó sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java ÐÞ¸Ä
@@ -20,6 +20,6 @@
    //查询销售单列表
    IPage<Map<String, Object>> selectSaleList(Page<Object> page, String orderNumber, String name, Integer type, String delTime);



    //查询订单bom列表
    IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer state, String time);
}

 inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMaterialMapper.java

 inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java

ÎļþÃû´Ó sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java ÐÞ¸Ä
@@ -90,5 +90,8 @@
    @ApiModelProperty(value = "状态 0:不通过;1:通过")
    private Integer type;

    @ApiModelProperty(value = "编制状态0:待编制;1已编制    é€šè¿‡å°±æ˜¯å·²ç¼–制,没有状态就是待编制")
    private Integer bianzhiState;


}

 inventory-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java

 inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java

 inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java

 inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java

 inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java

 inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java

ÎļþÃû´Ó sale-server/src/main/java/com/yuanchu/mom/pojo/dto/vo/SaleVo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.yuanchu.mom.pojo.dto.vo;
package com.yuanchu.mom.pojo.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

 inventory-server/src/main/java/com/yuanchu/mom/service/OrdersService.java

ÎļþÃû´Ó standard-server/src/main/java/com/yuanchu/mom/service/OrdersService.java ÐÞ¸Ä
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.Orders;

import java.util.Map;

@@ -13,7 +12,7 @@
 * @author zss
 * @since 2023-07-31 11:57:44
 */
public interface OrdersService extends IService<Orders> {
public interface OrdersService  {
    /**
     * æŸ¥è¯¢æ‰€æœ‰è®¢å•åˆ—表
     *

 inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.Repertory;

import java.util.List;
import java.util.Map;

/**
@@ -25,5 +26,11 @@
     * @return
     */
    IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState);

    /**
     * æŸ¥è¯¢åº“存三个字段给添加销售单
     * @return
     */
    List<Map<String,Object>> getSale();
}


 inventory-server/src/main/java/com/yuanchu/mom/service/SaleMaterialService.java

 inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java

ÎļþÃû´Ó sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java ÐÞ¸Ä
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.dto.ConsignmentDto1;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.pojo.dto.vo.SaleVo;
import com.yuanchu.mom.pojo.vo.SaleVo;

import java.util.List;
import java.util.Map;

 inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java

ÎļþÃû´Ó standard-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java ÐÞ¸Ä
@@ -1,16 +1,13 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.OrdersMapper;
import com.yuanchu.mom.pojo.Orders;
import com.yuanchu.mom.mapper.SaleMapper;
import com.yuanchu.mom.service.OrdersService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

/**
@@ -20,15 +17,15 @@
 * @since 2023-07-31 11:57:44
 */
@Service("orderService")
public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements OrdersService {
public class OrdersServiceImpl  implements OrdersService {

    @Resource
    OrdersMapper orderMapper;
    SaleMapper saleMapper;

    //查询所有订单列表
    @Override
    public IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer state , String time) {
        return  orderMapper.selectAllOrder(page, orderCode,name,state, time);
        return saleMapper.selectAllOrder(page, orderCode,name,state, time);
    }

}

 inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java

@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;

/**
@@ -28,5 +29,11 @@
    public IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState) {
        return repertoryMapper.selectAllRepertory(page,name,specifications,time,type,checkState);
    }

    //查询库存三个字段给添加销售单
    @Override
    public List<Map<String, Object>> getSale() {
        return repertoryMapper.getSale();
    }
}


 inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleMaterialServiceImpl.java

 inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java

ÎļþÃû´Ó sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java ÐÞ¸Ä
@@ -11,7 +11,7 @@
import com.yuanchu.mom.pojo.dto.ConsignmentDto2;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.pojo.dto.SaleMaterialDto;
import com.yuanchu.mom.pojo.dto.vo.SaleVo;
import com.yuanchu.mom.pojo.vo.SaleVo;
import com.yuanchu.mom.service.SaleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -53,7 +53,7 @@
        BeanUtils.copyProperties(saleDto,sale);
        sale.setSaleman(saleman);
        saleMapper.insert(sale);
        //如果saleMaterialList有值,需要添加销售产品单
        //添加销售产品单
        List<SaleMaterialDto> saleMaterialDtoList = saleDto.getSaleMaterialList();
        for (SaleMaterialDto saleMaterialDto : saleMaterialDtoList) {
            SaleMaterial saleMaterial = new SaleMaterial();
@@ -134,6 +134,13 @@
        sale.setType(type);
        sale.setCheckname(checkname);
        sale.setCheckTime(new Date());
        if (type==1) {
            //如果审核通过
            sale.setBianzhiState(1);
        }else {
            //如果审核不通过
            sale.setBianzhiState(null);
        }
        saleMapper.updateById(sale);
    }


 inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml

@@ -10,7 +10,7 @@
        unit,
        number,
        user_name,
        create_time
        DATE_FORMAT(create_time, '%Y-%m-%d')'入库日期'
        from mom_ocean.import_repertory
        where state=1
        <if test="orderCode!=null and orderCode!=''">

 inventory-server/src/main/resources/mapper/RepertoryMapper.xml

@@ -30,5 +30,11 @@
            </if>
            order by id desc
        </where>
    </select>
    <!--查询库存三个字段给添加销售单-->
    <select id="getSale" resultType="java.util.Map">
        select id, name, specifications, unit
        from mom_ocean.repertory
        where state = 1
    </select>
</mapper>

 inventory-server/src/main/resources/mapper/SaleMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
<?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.yuanchu.mom.mapper.SaleMapper">
    <select id="selectSaleList" resultType="java.util.Map">
        select id,
        order_number,
        code,
        name,
        proname,
        type,
        DATE_FORMAT(delTime, '%Y-%m-%d') '交货日期'
        from mom_ocean.sale
        where state=1
        <if test="orderNumber!=null and orderNumber!=''">
            and order_number like concat('%',#{orderNumber},'%')
        </if>
        <if test="name!=null and name!=''">
            and name LIKE CONCAT('%',#{name},'%')
        </if>
        <if test="type!=null and type!=''">
            and type=#{type}
        </if>
        <if test="delTime!=null and delTime!=''">
            and DATE_FORMAT(delTime, '%Y-%m-%d')=#{delTime}
        </if>
        order by id desc
    </select>

    <!--查询订单BOM列表-->
    <select id="selectAllOrder" resultType="java.util.Map">
        select s.id ,
            order_number,
            saleman,
            proname,
            sm.name,
            specifications,
            unit,
            number,
            DATE_FORMAT(s.create_time, '%Y-%m-%d') '下单日期',
            DATE_FORMAT(delTime, '%Y-%m-%d') '交货日期',
            bianzhi_state
            from mom_ocean.sale s ,mom_ocean.sale_material sm
        where s.id=sm.sale_id
        and s.state=1
        <if test="orderCode!=null and orderCode!=''">
            and order_number like concat('%',#{orderCode},'%')
        </if>
        <if test="name!=null and name!=''">
            and sm.name like concat('%',#{name},'%')
        </if>
        <if test="state!=null and state!=''">
            and bianzhi_state=#{state}
        </if>
        <if test="time!=null and time!=''">
            and s.create_time=#{time}
        </if>
    </select>
</mapper>

 inventory-server/src/main/resources/mapper/SaleMaterialMapper.xml

 pom.xml

@@ -22,7 +22,6 @@
        <module>inspect-server</module>
        <module>inventory-server</module>
        <module>system-run</module>
        <module>sale-server</module>
    </modules>

    <properties>

 sale-server/pom.xml

ÎļþÒÑɾ³ý

 sale-server/src/main/resources/mapper/SaleMapper.xml

ÎļþÒÑɾ³ý

 standard-server/pom.xml

@@ -33,5 +33,6 @@
            <artifactId>user-server</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>

    </dependencies>
</project>

 standard-server/src/main/java/com/yuanchu/mom/mapper/OrdersMapper.java

ÎļþÒÑɾ³ý

 standard-server/src/main/java/com/yuanchu/mom/pojo/Orders.java

ÎļþÒÑɾ³ý

 standard-server/src/main/resources/mapper/OrdersMapper.xml

ÎļþÒÑɾ³ý

 system-run/pom.xml

@@ -45,16 +45,6 @@
            <artifactId>inventory-server</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>inventory-server</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>sale-server</artifactId>
            <version>1.0.0</version>
        </dependency>

        <!--druid-->
        <dependency>