出库记录

sto/src/main/java/com/shinsoft/sto/controller/record/InrecordController.java → sto/src/main/java/com/shinsoft/sto/controller/record/InRecordController.java

@@ -15,7 +15,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/InRecord")
-public class InrecordController {
+public class InRecordController {
 
     @Autowired
     private InrecordService inrecordService;

sto/src/main/java/com/shinsoft/sto/controller/record/OutrecordController.java

@@ -0,0 +1,58 @@
+package com.shinsoft.sto.controller.record;
+
+import com.alibaba.fastjson.JSON;
+import com.shinsoft.sto.model.system.ResultJSON;
+import com.shinsoft.sto.service.record.OutrecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/OutRecord")
+public class OutrecordController {
+
+    @Autowired
+    private OutrecordService outrecordService;
+
+    @RequestMapping("/query")
+    public ResultJSON query(@RequestParam(defaultValue = "1") int page,
+                            @RequestParam(defaultValue = "50") int rows,
+                            String params,
+                            HttpServletRequest request) {
+        try {
+            Map<String, Object> map = buildQueryParams(params, request);
+            return outrecordService.query(page, rows, map);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("查询失败：" + ex.getMessage());
+        }
+    }
+
+    @GetMapping("/statistics")
+    public ResultJSON statistics(String params, HttpServletRequest request) {
+        try {
+            Map<String, Object> map = buildQueryParams(params, request);
+            return outrecordService.statistics(map);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("统计失败：" + ex.getMessage());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, Object> buildQueryParams(String params, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        if (params != null && !params.trim().isEmpty()) {
+            map.putAll(JSON.parseObject(params, Map.class));
+        }
+        return map;
+    }
+}
+
+

sto/src/main/java/com/shinsoft/sto/mapper/record/OutrecordMapper.java

@@ -0,0 +1,19 @@
+package com.shinsoft.sto.mapper.record;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.shinsoft.sto.model.record.Outrecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+public interface OutrecordMapper extends BaseMapper<Outrecord> {
+
+    IPage<Outrecord> selectOutrecordPage(Page<Outrecord> page,
+                                         @Param("parms") Map<String, Object> map);
+
+    Map<String, Object> selectStatistics(@Param("parms") Map<String, Object> map);
+}
+
+

sto/src/main/java/com/shinsoft/sto/mapper/record/OutrecordMapper.xml

@@ -0,0 +1,219 @@
+<?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.shinsoft.sto.mapper.record.OutrecordMapper">
+
+    <resultMap id="OutrecordResultMap" type="com.shinsoft.sto.model.record.Outrecord">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="belong_id" property="belongId" jdbcType="VARCHAR"/>
+        <result column="in_truck_no" property="inTruckNo" jdbcType="VARCHAR"/>
+        <result column="tally_people" property="tallyPeople" jdbcType="VARCHAR"/>
+        <result column="in_dtm" property="inDtm" jdbcType="TIMESTAMP"/>
+        <result column="out_ware_name" property="outWareName" jdbcType="VARCHAR"/>
+        <result column="out_stack_name" property="outStackName" jdbcType="VARCHAR"/>
+        <result column="out_layer_no" property="outLayerNo" jdbcType="VARCHAR"/>
+        <result column="prod_no" property="prodNo" jdbcType="VARCHAR"/>
+        <result column="owner_company" property="ownerCompany" jdbcType="VARCHAR"/>
+        <result column="receiving_company" property="receivingCompany" jdbcType="VARCHAR"/>
+        <result column="customer_company" property="customerCompany" jdbcType="VARCHAR"/>
+        <result column="material_id" property="materialId" jdbcType="VARCHAR"/>
+        <result column="st_grade" property="stGrade" jdbcType="VARCHAR"/>
+        <result column="out_weight" property="outWeight" jdbcType="DECIMAL"/>
+        <result column="out_quantity" property="outQuantity" jdbcType="DECIMAL"/>
+        <result column="out_flag" property="outFlag" jdbcType="VARCHAR"/>
+        <result column="delivery_address" property="deliveryAddress" jdbcType="VARCHAR"/>
+        <result column="attrib_01" property="attrib01" jdbcType="VARCHAR"/>
+        <result column="attrib_02" property="attrib02" jdbcType="VARCHAR"/>
+        <result column="attrib_03" property="attrib03" jdbcType="VARCHAR"/>
+        <result column="attrib_04" property="attrib04" jdbcType="VARCHAR"/>
+        <result column="attrib_05" property="attrib05" jdbcType="VARCHAR"/>
+        <result column="attrib_06" property="attrib06" jdbcType="VARCHAR"/>
+        <result column="attrib_07" property="attrib07" jdbcType="VARCHAR"/>
+        <result column="attrib_08" property="attrib08" jdbcType="VARCHAR"/>
+        <result column="attrib_09" property="attrib09" jdbcType="VARCHAR"/>
+        <result column="attrib_10" property="attrib10" jdbcType="VARCHAR"/>
+        <result column="attrib_11" property="attrib11" jdbcType="VARCHAR"/>
+        <result column="attrib_12" property="attrib12" jdbcType="VARCHAR"/>
+        <result column="attrib_13" property="attrib13" jdbcType="VARCHAR"/>
+        <result column="attrib_14" property="attrib14" jdbcType="VARCHAR"/>
+        <result column="attrib_15" property="attrib15" jdbcType="VARCHAR"/>
+        <result column="attrib_16" property="attrib16" jdbcType="VARCHAR"/>
+        <result column="attrib_17" property="attrib17" jdbcType="VARCHAR"/>
+        <result column="attrib_18" property="attrib18" jdbcType="VARCHAR"/>
+        <result column="attrib_19" property="attrib19" jdbcType="VARCHAR"/>
+        <result column="attrib_20" property="attrib20" jdbcType="VARCHAR"/>
+        <result column="attrib_21" property="attrib21" jdbcType="VARCHAR"/>
+        <result column="attrib_22" property="attrib22" jdbcType="VARCHAR"/>
+        <result column="attrib_23" property="attrib23" jdbcType="VARCHAR"/>
+        <result column="attrib_24" property="attrib24" jdbcType="VARCHAR"/>
+        <result column="attrib_25" property="attrib25" jdbcType="VARCHAR"/>
+        <result column="remark_1" property="remark1" jdbcType="VARCHAR"/>
+        <result column="remark_2" property="remark2" jdbcType="VARCHAR"/>
+        <result column="remark_3" property="remark3" jdbcType="VARCHAR"/>
+        <result column="remark_4" property="remark4" jdbcType="VARCHAR"/>
+        <result column="remark_5" property="remark5" jdbcType="VARCHAR"/>
+        <result column="out_truck_no" property="outTruckNo" jdbcType="VARCHAR"/>
+        <result column="out_dtm" property="outDtm" jdbcType="TIMESTAMP"/>
+        <result column="distrib_id" property="distribId" jdbcType="VARCHAR"/>
+        <result column="out_user_id" property="outUserId" jdbcType="VARCHAR"/>
+        <result column="owner_company_name" property="ownerCompanyName" jdbcType="VARCHAR"/>
+        <result column="receiving_company_name" property="receivingCompanyName" jdbcType="VARCHAR"/>
+        <result column="customer_company_name" property="customerCompanyName" jdbcType="VARCHAR"/>
+        <result column="material_name" property="materialName" jdbcType="VARCHAR"/>
+        <result column="material_code" property="materialCode" jdbcType="VARCHAR"/>
+        <result column="material_standard" property="materialStandard" jdbcType="VARCHAR"/>
+        <result column="material_model" property="materialModel" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="OutrecordWhere">
+        where 1=1
+        <if test="parms.wareName != null and parms.wareName != ''">
+            and tor.OUT_WARE_NAME like '%' || #{parms.wareName} || '%'
+        </if>
+        <if test="parms.outWareName != null and parms.outWareName != ''">
+            and tor.OUT_WARE_NAME like '%' || #{parms.outWareName} || '%'
+        </if>
+        <if test="parms.stackName != null and parms.stackName != ''">
+            and tor.OUT_STACK_NAME like '%' || #{parms.stackName} || '%'
+        </if>
+        <if test="parms.outStackName != null and parms.outStackName != ''">
+            and tor.OUT_STACK_NAME like '%' || #{parms.outStackName} || '%'
+        </if>
+        <if test="parms.outLayerNo != null and parms.outLayerNo != ''">
+            and tor.OUT_LAYER_NO = #{parms.outLayerNo}
+        </if>
+        <if test="parms.inTruckNo != null and parms.inTruckNo != ''">
+            and tor.IN_TRUCK_NO like '%' || #{parms.inTruckNo} || '%'
+        </if>
+        <if test="parms.outTruckNo != null and parms.outTruckNo != ''">
+            and tor.OUT_TRUCK_NO like '%' || #{parms.outTruckNo} || '%'
+        </if>
+        <if test="parms.materialName != null and parms.materialName != ''">
+            and material.MATERIAL_NAME like '%' || #{parms.materialName} || '%'
+        </if>
+        <if test="parms.ownerCompany != null and parms.ownerCompany != ''">
+            and owner.id = #{parms.ownerCompany}
+        </if>
+        <if test="parms.receivingCompany != null and parms.receivingCompany != ''">
+            and receiving.id = #{parms.receivingCompany}
+        </if>
+        <if test="parms.customerCompany != null and parms.customerCompany != ''">
+            and customer.id = #{parms.customerCompany}
+        </if>
+        <if test="parms.startDtm != null and parms.startDtm != ''">
+            and tor.OUT_DTM &gt;= TO_DATE(#{parms.startDtm}, 'yyyy-MM-dd hh24:mi:ss')
+        </if>
+        <if test="parms.endDtm != null and parms.endDtm != ''">
+            and tor.OUT_DTM &lt;= TO_DATE(#{parms.endDtm}, 'yyyy-MM-dd hh24:mi:ss')
+        </if>
+        <if test="parms.startOutDtm != null and parms.startOutDtm != ''">
+            and tor.OUT_DTM &gt;= TO_DATE(#{parms.startOutDtm}, 'yyyy-MM-dd hh24:mi:ss')
+        </if>
+        <if test="parms.endOutDtm != null and parms.endOutDtm != ''">
+            and tor.OUT_DTM &lt;= TO_DATE(#{parms.endOutDtm}, 'yyyy-MM-dd hh24:mi:ss')
+        </if>
+        <if test="parms.startInDtm != null and parms.startInDtm != ''">
+            and tor.IN_DTM &gt;= TO_DATE(#{parms.startInDtm}, 'yyyy-MM-dd hh24:mi:ss')
+        </if>
+        <if test="parms.endInDtm != null and parms.endInDtm != ''">
+            and tor.IN_DTM &lt;= TO_DATE(#{parms.endInDtm}, 'yyyy-MM-dd hh24:mi:ss')
+        </if>
+        <if test="parms.prodNo != null and parms.prodNo != ''">
+            and tor.PROD_NO like '%' || #{parms.prodNo} || '%'
+        </if>
+        <if test="parms.materialId != null and parms.materialId != ''">
+            and tor.MATERIAL_ID = #{parms.materialId}
+        </if>
+        <if test="parms.outFlag != null and parms.outFlag != ''">
+            and tor.OUT_FLAG = #{parms.outFlag}
+        </if>
+        <if test="parms.distribId != null and parms.distribId != ''">
+            and tor.DISTRIB_ID = #{parms.distribId}
+        </if>
+        <if test="parms.outUserId != null and parms.outUserId != ''">
+            and tor.OUT_USER_ID = #{parms.outUserId}
+        </if>
+    </sql>
+
+    <select id="selectOutrecordPage" resultMap="OutrecordResultMap" parameterType="map">
+        select
+            tor.id,
+            tor.belong_id,
+            tor.in_truck_no,
+            tor.tally_people,
+            tor.in_dtm,
+            tor.out_ware_name,
+            tor.out_stack_name,
+            tor.out_layer_no,
+            tor.prod_no,
+            tor.owner_company,
+            tor.receiving_company,
+            tor.customer_company,
+            tor.material_id,
+            tor.st_grade,
+            tor.out_weight,
+            tor.out_quantity,
+            tor.out_flag,
+            nvl(tor.delivery_address, owner.default_address) as delivery_address,
+            tor.attrib_01,
+            tor.attrib_02,
+            tor.attrib_03,
+            tor.attrib_04,
+            tor.attrib_05,
+            tor.attrib_06,
+            tor.attrib_07,
+            tor.attrib_08,
+            tor.attrib_09,
+            tor.attrib_10,
+            tor.attrib_11,
+            tor.attrib_12,
+            tor.attrib_13,
+            tor.attrib_14,
+            tor.attrib_15,
+            tor.attrib_16,
+            tor.attrib_17,
+            tor.attrib_18,
+            tor.attrib_19,
+            tor.attrib_20,
+            tor.attrib_21,
+            tor.attrib_22,
+            tor.attrib_23,
+            tor.attrib_24,
+            tor.attrib_25,
+            tor.remark_1,
+            tor.remark_2,
+            tor.remark_3,
+            tor.remark_4,
+            tor.remark_5,
+            tor.out_truck_no,
+            tor.out_dtm,
+            tor.distrib_id,
+            tor.out_user_id,
+            owner.customer_nm as owner_company_name,
+            receiving.customer_nm as receiving_company_name,
+            customer.customer_nm as customer_company_name,
+            material.material_name as material_name,
+            material.material_code as material_code,
+            material.material_standard as material_standard,
+            material.material_model as material_model
+        from T_OUT_RECORD tor
+                 left join T_MAIN_CUSTOMER owner on owner.id = tor.owner_company
+                 left join T_MAIN_CUSTOMER receiving on receiving.id = tor.receiving_company
+                 left join T_MAIN_CUSTOMER customer on customer.id = tor.customer_company
+                 left join T_MAIN_MATERIAL material on material.id = tor.material_id
+        <include refid="OutrecordWhere"/>
+        order by tor.out_dtm desc
+    </select>
+
+    <select id="selectStatistics" resultType="map" parameterType="map">
+        select
+            nvl(sum(tor.out_quantity), 0) as totalQuantity,
+            nvl(sum(tor.out_weight), 0) as totalWeight
+        from T_OUT_RECORD tor
+                 left join T_MAIN_CUSTOMER owner on owner.id = tor.owner_company
+                 left join T_MAIN_CUSTOMER receiving on receiving.id = tor.receiving_company
+                 left join T_MAIN_CUSTOMER customer on customer.id = tor.customer_company
+                 left join T_MAIN_MATERIAL material on material.id = tor.material_id
+        <include refid="OutrecordWhere"/>
+    </select>
+</mapper>
+

sto/src/main/java/com/shinsoft/sto/model/record/Outrecord.java

@@ -0,0 +1,169 @@
+package com.shinsoft.sto.model.record;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.shinsoft.generator.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 出库记录视图模型，对应 T_OUT_RECORD 表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("T_OUT_RECORD")
+@ApiModel(value = "Outrecord", description = "出库记录")
+public class Outrecord extends BaseModel {
+
+    @ApiModelProperty("入库车号")
+    private String inTruckNo;
+
+    @ApiModelProperty("入库/理货人员姓名")
+    private String tallyPeople;
+
+    @ApiModelProperty("入库时间")
+    private Date inDtm;
+
+    @ApiModelProperty("出库库房名称")
+    private String outWareName;
+
+    @ApiModelProperty("出库垛位名称")
+    private String outStackName;
+
+    @ApiModelProperty("出库层号")
+    private String outLayerNo;
+
+    @ApiModelProperty("材料号/批号")
+    private String prodNo;
+
+    @ApiModelProperty("货权公司ID")
+    private String ownerCompany;
+
+    @ApiModelProperty("收货公司ID")
+    private String receivingCompany;
+
+    @ApiModelProperty("最终客户公司ID")
+    private String customerCompany;
+
+    @ApiModelProperty("物料ID")
+    private String materialId;
+
+    @ApiModelProperty("钢种信息")
+    private String stGrade;
+
+    @ApiModelProperty("出库重量")
+    private BigDecimal outWeight;
+
+    @ApiModelProperty("出库数量")
+    private BigDecimal outQuantity;
+
+    @ApiModelProperty("出库标记0为正常在用，1为取消入库")
+    private String outFlag;
+
+    @ApiModelProperty("收货地址,空时读取客户表地址")
+    private String deliveryAddress;
+
+    @ApiModelProperty("材料属性01")
+    private String attrib01;
+    @ApiModelProperty("材料属性02")
+    private String attrib02;
+    @ApiModelProperty("材料属性03")
+    private String attrib03;
+    @ApiModelProperty("材料属性04")
+    private String attrib04;
+    @ApiModelProperty("材料属性05")
+    private String attrib05;
+    @ApiModelProperty("材料属性06")
+    private String attrib06;
+    @ApiModelProperty("材料属性07")
+    private String attrib07;
+    @ApiModelProperty("材料属性08")
+    private String attrib08;
+    @ApiModelProperty("材料属性09")
+    private String attrib09;
+    @ApiModelProperty("材料属性10")
+    private String attrib10;
+    @ApiModelProperty("材料属性11")
+    private String attrib11;
+    @ApiModelProperty("材料属性12")
+    private String attrib12;
+    @ApiModelProperty("材料属性13")
+    private String attrib13;
+    @ApiModelProperty("材料属性14")
+    private String attrib14;
+    @ApiModelProperty("材料属性15")
+    private String attrib15;
+    @ApiModelProperty("材料属性16")
+    private String attrib16;
+    @ApiModelProperty("材料属性17")
+    private String attrib17;
+    @ApiModelProperty("材料属性18")
+    private String attrib18;
+    @ApiModelProperty("材料属性19")
+    private String attrib19;
+    @ApiModelProperty("材料属性20")
+    private String attrib20;
+    @ApiModelProperty("材料属性21")
+    private String attrib21;
+    @ApiModelProperty("材料属性22")
+    private String attrib22;
+    @ApiModelProperty("材料属性23")
+    private String attrib23;
+    @ApiModelProperty("材料属性24")
+    private String attrib24;
+    @ApiModelProperty("材料属性25")
+    private String attrib25;
+
+    @ApiModelProperty("备注信息1")
+    private String remark1;
+    @ApiModelProperty("备注信息2")
+    private String remark2;
+    @ApiModelProperty("备注信息3")
+    private String remark3;
+    @ApiModelProperty("备注信息4")
+    private String remark4;
+    @ApiModelProperty("备注信息5")
+    private String remark5;
+
+    @ApiModelProperty("出库车号")
+    private String outTruckNo;
+
+    @ApiModelProperty("出库时间")
+    private Date outDtm;
+
+    @ApiModelProperty("配车单ID")
+    private String distribId;
+
+    @ApiModelProperty("出库人员id")
+    private String outUserId;
+
+    @TableField(exist = false)
+    private String ownerCompanyName;
+
+    @TableField(exist = false)
+    private String receivingCompanyName;
+
+    @TableField(exist = false)
+    private String customerCompanyName;
+
+    @TableField(exist = false)
+    private String materialName;
+
+    @TableField(exist = false)
+    private String materialCode;
+
+    @TableField(exist = false)
+    private String materialStandard;
+
+    @TableField(exist = false)
+    private String materialModel;
+}
+
+

sto/src/main/java/com/shinsoft/sto/service/impl/record/OutrecordServiceImpl.java

@@ -0,0 +1,42 @@
+package com.shinsoft.sto.service.impl.record;
+
+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.shinsoft.sto.mapper.record.OutrecordMapper;
+import com.shinsoft.sto.model.record.Outrecord;
+import com.shinsoft.sto.model.system.ResponseCodeMsg;
+import com.shinsoft.sto.model.system.ResultJSON;
+import com.shinsoft.sto.service.record.OutrecordService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class OutrecordServiceImpl extends ServiceImpl<OutrecordMapper, Outrecord> implements OutrecordService {
+
+    @Override
+    public ResultJSON query(int page, int rows, Map<String, Object> map) {
+        try {
+            Page<Outrecord> pageParam = new Page<>(page, rows);
+            IPage<Outrecord> result = baseMapper.selectOutrecordPage(pageParam, map);
+            return ResultJSON.success(result);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        }
+    }
+
+    @Override
+    public ResultJSON statistics(Map<String, Object> map) {
+        try {
+            Map<String, Object> stats = baseMapper.selectStatistics(map);
+            return ResultJSON.success(stats);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        }
+    }
+}
+
+

sto/src/main/java/com/shinsoft/sto/service/record/OutrecordService.java

@@ -0,0 +1,16 @@
+package com.shinsoft.sto.service.record;
+
+import com.shinsoft.sto.model.system.ResultJSON;
+
+import java.util.Map;
+
+public interface OutrecordService {
+
+    ResultJSON query(int page,
+                     int rows,
+                     Map<String, Object> map);
+
+    ResultJSON statistics(Map<String, Object> map);
+}
+
+