报检报表新增导出、新增检验任务编号字段、报检日期查询

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java

@@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.op.wms.domain.OdsProcureOrder;
 import com.op.wms.domain.WmsProductPut;
+import com.op.wms.domain.query.OrderCheckQuery;
+import com.op.wms.domain.vo.OrderCheckVo;
 import com.op.wms.service.IOdsProcureOrderService;
 import com.op.wms.service.IWmsProductPutService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -138,6 +140,18 @@ public class WmsRawOrderInController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 报检报表导出
+     * **/
+    @RequiresPermissions("wms:odsRawOrderBJ:export")
+    @Log(title = "报检报表导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportBJ")
+    public void exportBJ(HttpServletResponse response, OrderCheckQuery query) {
+        List<OrderCheckVo> list = wmsRawOrderInService.getOrderCheckList(query);
+        ExcelUtil<OrderCheckVo> util = new ExcelUtil<OrderCheckVo>(OrderCheckVo.class);
+        util.exportExcel(response, list, "报检报表数据");
+    }
+
     /**
      * pda上查询包材到货单已暂时列表
      */

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java

@@ -364,6 +364,71 @@ public class WmsRawOrderIn extends BaseEntity {
     private String checkManCode;
     private String checkManName;
 
+    /**
+     * 检验任务号
+     * **/
+    private String checkNo;
+
+    /**
+     * 报检开始时间
+     * **/
+    private String checkTimeStart;
+
+    /**
+     * 报检结束时间
+     * **/
+    private String checkTimeEnd;
+
+    /**
+     * 收货开始时间
+     * **/
+    private String deliveryTimeStart;
+
+    /**
+     * 收货结束时间
+     * **/
+    private String deliveryTimeEnd;
+
+    public String getCheckNo() {
+        return checkNo;
+    }
+
+    public void setCheckNo(String checkNo) {
+        this.checkNo = checkNo;
+    }
+
+    public String getCheckTimeStart() {
+        return checkTimeStart;
+    }
+
+    public void setCheckTimeStart(String checkTimeStart) {
+        this.checkTimeStart = checkTimeStart;
+    }
+
+    public String getCheckTimeEnd() {
+        return checkTimeEnd;
+    }
+
+    public void setCheckTimeEnd(String checkTimeEnd) {
+        this.checkTimeEnd = checkTimeEnd;
+    }
+
+    public String getDeliveryTimeStart() {
+        return deliveryTimeStart;
+    }
+
+    public void setDeliveryTimeStart(String deliveryTimeStart) {
+        this.deliveryTimeStart = deliveryTimeStart;
+    }
+
+    public String getDeliveryTimeEnd() {
+        return deliveryTimeEnd;
+    }
+
+    public void setDeliveryTimeEnd(String deliveryTimeEnd) {
+        this.deliveryTimeEnd = deliveryTimeEnd;
+    }
+
     public String getProcureCode() {
         return procureCode;
     }

op-modules/op-wms/src/main/java/com/op/wms/domain/query/OrderCheckQuery.java

@@ -0,0 +1,89 @@
+package com.op.wms.domain.query;
+
+/**
+ * remark
+ *
+ * @author 019117
+ * @date
+ */
+public class OrderCheckQuery {
+
+    /**
+     * 送货单号
+     * **/
+    private String orderNo;
+
+    /**
+     * 采购单号
+     * **/
+    private String procureCode;
+
+    /**
+     * 物料编码
+     * **/
+    private String materialCode;
+
+    /**
+     * 物料描述
+     * **/
+    private String materialDesc;
+
+    /**
+     * 报检日期查询条件(开始)
+     * **/
+    private String checkTimeStart;
+
+    /**
+     * 报检日期查询条件(结束)
+     * **/
+    private String checkTimeEnd;
+
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getProcureCode() {
+        return procureCode;
+    }
+
+    public void setProcureCode(String procureCode) {
+        this.procureCode = procureCode;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialDesc() {
+        return materialDesc;
+    }
+
+    public void setMaterialDesc(String materialDesc) {
+        this.materialDesc = materialDesc;
+    }
+
+    public String getCheckTimeStart() {
+        return checkTimeStart;
+    }
+
+    public void setCheckTimeStart(String checkTimeStart) {
+        this.checkTimeStart = checkTimeStart;
+    }
+
+    public String getCheckTimeEnd() {
+        return checkTimeEnd;
+    }
+
+    public void setCheckTimeEnd(String checkTimeEnd) {
+        this.checkTimeEnd = checkTimeEnd;
+    }
+}

op-modules/op-wms/src/main/java/com/op/wms/domain/vo/OrderCheckVo.java

@@ -0,0 +1,209 @@
+package com.op.wms.domain.vo;
+
+import com.op.common.core.annotation.Excel;
+
+/**
+ * remark
+ *
+ * @author 019117
+ * @date
+ */
+public class OrderCheckVo {
+
+    /**
+     * 送货单号
+     * **/
+    @Excel(name = "送货单号")
+    private String orderNo;
+
+    /**
+     * 采购单号
+     * **/
+    @Excel(name = "采购单号")
+    private String procureCode;
+
+    /**
+     * 物料编码
+     * **/
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    /**
+     * 物料名称
+     * **/
+    @Excel(name = "物料名称")
+    private String materialDesc;
+
+    /**
+     * 实收数量
+     * **/
+    @Excel(name = "实收数量")
+    private Integer actualQuantity;
+
+    /**
+     * 报检时间
+     * **/
+    @Excel(name = "报检时间")
+    private String checkTime;
+
+    /**
+     * 报检任务号
+     * **/
+    @Excel(name = "检验任务编号")
+    private String checkNo;
+
+    /**
+     * 报检人
+     * **/
+    @Excel(name = "报检人")
+    private String applyPerson;
+
+    /**
+     * 暂收时间
+     * **/
+    @Excel(name = "暂收时间")
+    private String temporaryTime;
+
+    /**
+     * 质检开始时间
+     * **/
+    @Excel(name = "质检开始时间")
+    private String checkStartTime;
+
+    /**
+     * 质检结束时间
+     * **/
+    @Excel(name = "质检结束时间")
+    private String checkEndTime;
+
+    /**
+     * 检验人
+     * **/
+    @Excel(name = "检验人")
+    private String checkPerson;
+
+    /**
+     * 105收货时间
+     * **/
+    @Excel(name = "收货时间")
+    private String receiveTime105;
+
+    /**
+     * 收货人
+     * **/
+    @Excel(name = "收货人")
+    private String receivePerson105;
+
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getProcureCode() {
+        return procureCode;
+    }
+
+    public void setProcureCode(String procureCode) {
+        this.procureCode = procureCode;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialDesc() {
+        return materialDesc;
+    }
+
+    public void setMaterialDesc(String materialDesc) {
+        this.materialDesc = materialDesc;
+    }
+
+    public Integer getActualQuantity() {
+        return actualQuantity;
+    }
+
+    public void setActualQuantity(Integer actualQuantity) {
+        this.actualQuantity = actualQuantity;
+    }
+
+    public String getCheckTime() {
+        return checkTime;
+    }
+
+    public void setCheckTime(String checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public String getCheckNo() {
+        return checkNo;
+    }
+
+    public void setCheckNo(String checkNo) {
+        this.checkNo = checkNo;
+    }
+
+    public String getApplyPerson() {
+        return applyPerson;
+    }
+
+    public void setApplyPerson(String applyPerson) {
+        this.applyPerson = applyPerson;
+    }
+
+    public String getTemporaryTime() {
+        return temporaryTime;
+    }
+
+    public void setTemporaryTime(String temporaryTime) {
+        this.temporaryTime = temporaryTime;
+    }
+
+    public String getCheckStartTime() {
+        return checkStartTime;
+    }
+
+    public void setCheckStartTime(String checkStartTime) {
+        this.checkStartTime = checkStartTime;
+    }
+
+    public String getCheckEndTime() {
+        return checkEndTime;
+    }
+
+    public void setCheckEndTime(String checkEndTime) {
+        this.checkEndTime = checkEndTime;
+    }
+
+    public String getCheckPerson() {
+        return checkPerson;
+    }
+
+    public void setCheckPerson(String checkPerson) {
+        this.checkPerson = checkPerson;
+    }
+
+    public String getReceiveTime105() {
+        return receiveTime105;
+    }
+
+    public void setReceiveTime105(String receiveTime105) {
+        this.receiveTime105 = receiveTime105;
+    }
+
+    public String getReceivePerson105() {
+        return receivePerson105;
+    }
+
+    public void setReceivePerson105(String receivePerson105) {
+        this.receivePerson105 = receivePerson105;
+    }
+}

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import com.op.wms.domain.WmsRawOrderIn;
 import com.op.wms.domain.WmsToWCSDTO;
+import com.op.wms.domain.query.OrderCheckQuery;
+import com.op.wms.domain.vo.OrderCheckVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -77,4 +79,6 @@ public interface WmsRawOrderInMapper {
 
     List<WmsRawOrderIn> getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn);
 
+    List<OrderCheckVo> getOrderCheckList(OrderCheckQuery query);
+
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java

@@ -3,6 +3,8 @@ package com.op.wms.service;
 import java.util.List;
 
 import com.op.wms.domain.WmsRawOrderIn;
+import com.op.wms.domain.query.OrderCheckQuery;
+import com.op.wms.domain.vo.OrderCheckVo;
 
 /**
  * 包材到货单Service接口
@@ -65,4 +67,9 @@ public interface IWmsRawOrderInService {
      * pda上查询包材到货单已暂时列表
      */
     List<WmsRawOrderIn> getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn);
+
+    /**
+     * 获取报检报表列表
+     * **/
+    List<OrderCheckVo> getOrderCheckList(OrderCheckQuery query);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java

@@ -3,6 +3,8 @@ package com.op.wms.service.impl;
 import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.op.wms.domain.query.OrderCheckQuery;
+import com.op.wms.domain.vo.OrderCheckVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.op.wms.mapper.WmsRawOrderInMapper;
@@ -122,4 +124,15 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService {
         }
         return wmsRawOrderInList;
     }
+
+    /**
+     * 获取报检报表列表
+     *
+     * @param query 查询条件
+     **/
+    @Override
+    @DS("#header.poolName")
+    public List<OrderCheckVo> getOrderCheckList(OrderCheckQuery query) {
+        return wmsRawOrderInMapper.getOrderCheckList(query);
+    }
 }

op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml

@@ -67,6 +67,7 @@
         <result property="checkManCode" column="checkManCode"/>
         <result property="checkManName" column="checkManName"/>
         <result property="accountingtime" column="accountingtime"/>
+        <result property="checkNo" column="checkNo"/>
     </resultMap>
 
     <sql id="selectWmsRawOrderInVo">
@@ -567,6 +568,7 @@
             ods_procure_order.Create_Date   ,
             qc_check_task.create_time createtime,
             qc_check_task.check_time checktime,
+            qc_check_task.check_no checkNo,
             qc_check_task.check_man_code    checkManCode,
             qc_check_task.check_man_name    checkManName,
             wms_raw_order_in.accounting_time    accountingtime,
@@ -585,6 +587,8 @@
         <if test="materialCode != null  and materialCode != ''">and ods_procure_order.Material_Code like concat('%', #{materialCode},
             '%') </if>
         <if test="materialDesc != null  and materialDesc != ''">and ods_procure_order.Material_Desc = #{materialDesc}</if>
+        <if test="checkTimeStart != null  and checkTimeStart != ''">and CONVERT(varchar(16), qc_check_task.create_time, 120) >= #{checkTimeStart}</if>
+        <if test="checkTimeEnd != null  and checkTimeEnd != ''">and #{checkTimeEnd} >= CONVERT(varchar(16), qc_check_task.create_time, 120)</if>
         ORDER BY
             ods_procure_order.Create_Date DESC
     </select>
@@ -661,4 +665,41 @@
         </where>
         ORDER BY wms_raw_order_in.gmt_create	DESC
     </select>
+
+
+    <select id="getOrderCheckList" resultType="com.op.wms.domain.vo.OrderCheckVo" parameterType="com.op.wms.domain.query.OrderCheckQuery">
+        SELECT
+        ods_procure_order.User_Defined5 orderNo,
+        ods_procure_order.Procure_Code procureCode,
+        ods_procure_order.Material_Code materialCode,
+        ods_procure_order.Material_Desc materialDesc,
+        ods_procure_order.Operation_Number actualQuantity,
+        ods_procure_order.Create_By applyPerson,
+        qc_check_task.create_time checkTime,
+        qc_check_task.create_time checkStartTime,
+        qc_check_task.check_time checkEndTime,
+        qc_check_task.check_no checkNo,
+        qc_check_task.check_man_code applyPerson,
+        qc_check_task.check_man_code checkPerson,
+        wms_raw_order_in.accounting_time receiveTime105,
+        wms_raw_order_in.gmt_create temporaryTime,
+        wms_raw_order_in.receipt_operator receivePerson105
+        FROM
+        ods_procure_order
+        LEFT JOIN qc_check_task ON CONCAT ( ods_procure_order.Procure_Code, ods_procure_order.User_Defined7 ) = qc_check_task.order_no
+        AND check_type = 'checkTypeLL'
+        LEFT JOIN wms_raw_order_in ON wms_raw_order_in.order_no	= ods_procure_order.User_Defined5
+        AND wms_raw_order_in.po_no= ods_procure_order.Procure_Code
+        WHERE
+        ods_procure_order.Operation_Number IS NOT NULL
+        <if test="orderNo != null  and orderNo != ''">and ods_procure_order.User_Defined5 = #{orderNo}</if>
+        <if test="procureCode != null  and procureCode != ''">and ods_procure_order.Procure_Code = #{procureCode}</if>
+        <if test="materialCode != null  and materialCode != ''">and ods_procure_order.Material_Code like concat('%', #{materialCode},
+            '%') </if>
+        <if test="materialDesc != null  and materialDesc != ''">and ods_procure_order.Material_Desc = #{materialDesc}</if>
+        <if test="checkTimeStart != null  and checkTimeStart != ''">and CONVERT(varchar(16), qc_check_task.create_time, 120) >= #{checkTimeStart}</if>
+        <if test="checkTimeEnd != null  and checkTimeEnd != ''">and #{checkTimeEnd} >= CONVERT(varchar(16), qc_check_task.create_time, 120)</if>
+        ORDER BY
+        ods_procure_order.Create_Date DESC
+    </select>
 </mapper>