wms的报检报表接口

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

@@ -127,4 +127,14 @@ public class WmsRawOrderInController extends BaseController {
          String   result = wmsProductPutService.handleUpdateSAP102(wmsProductPutList);
         return success(result);
     }
+    /**
+     * 报检报表
+     */
+
+    @PostMapping("/listZJ")
+    public TableDataInfo listInspectionReport(@RequestBody    WmsRawOrderIn wmsRawOrderIn) {
+        startPage();
+        List<WmsRawOrderIn> list = wmsRawOrderInService.listInspectionReport(wmsRawOrderIn);
+        return getDataTable(list);
+    }
 }

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

@@ -317,8 +317,8 @@ public class WmsRawOrderIn extends BaseEntity {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date gmtCreate;
 
     /**
@@ -343,6 +343,91 @@ public class WmsRawOrderIn extends BaseEntity {
 
     private String kem;
 
+
+    //--------------
+    private String procureCode;
+    private String operationNumber;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel( width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel( width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date checktime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createtime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date accountingtime;
+    private String checkManCode;
+    private String checkManName;
+
+    public String getProcureCode() {
+        return procureCode;
+    }
+
+    public void setProcureCode(String procureCode) {
+        this.procureCode = procureCode;
+    }
+
+    public String getOperationNumber() {
+        return operationNumber;
+    }
+
+    public void setOperationNumber(String operationNumber) {
+        this.operationNumber = operationNumber;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getChecktime() {
+        return checktime;
+    }
+
+    public void setChecktime(Date checktime) {
+        this.checktime = checktime;
+    }
+
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+
+    public Date getAccountingtime() {
+        return accountingtime;
+    }
+
+    public void setAccountingtime(Date accountingtime) {
+        this.accountingtime = accountingtime;
+    }
+
+    public String getCheckManCode() {
+        return checkManCode;
+    }
+
+    public void setCheckManCode(String checkManCode) {
+        this.checkManCode = checkManCode;
+    }
+
+    public String getCheckManName() {
+        return checkManName;
+    }
+
+    public void setCheckManName(String checkManName) {
+        this.checkManName = checkManName;
+    }
+
     public String getKem() {
         return kem;
     }

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

@@ -71,4 +71,6 @@ public interface WmsRawOrderInMapper {
     String selectQcCheckTask(WmsRawOrderIn wmsRawOrderIn1);
 
     WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdThress(String id);
+
+    List<WmsRawOrderIn> listInspectionReport(WmsRawOrderIn wmsRawOrderIn);
 }

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

@@ -58,4 +58,6 @@ public interface IWmsRawOrderInService {
      * @return 结果
      */
     public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId);
+
+    List<WmsRawOrderIn> listInspectionReport(WmsRawOrderIn wmsRawOrderIn);
 }

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

@@ -98,4 +98,11 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService {
     public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId) {
         return wmsRawOrderInMapper.deleteWmsRawOrderInByRawOrderInId(rawOrderInId);
     }
+
+    @Override
+    @DS("#header.poolName")
+    public List<WmsRawOrderIn> listInspectionReport(WmsRawOrderIn wmsRawOrderIn) {
+        List<WmsRawOrderIn> wmsRawOrderInList=  wmsRawOrderInMapper.listInspectionReport(wmsRawOrderIn);
+        return wmsRawOrderInList;
+    }
 }

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

@@ -59,6 +59,14 @@
         <result property="activeFlag" column="active_flag"/>
         <result property="incomeBatchNo" column="incomeBatchNo"/>
         <result property="kem" column="kem"/>
+        <result property="procureCode" column="Procure_Code"/>
+        <result property="operationNumber" column="Operation_Number"/>
+        <result property="createDate" column="Create_Date"/>
+        <result property="checktime" column="checktime"/>
+        <result property="createtime" column="createtime"/>
+        <result property="checkManCode" column="checkManCode"/>
+        <result property="checkManName" column="checkManName"/>
+        <result property="accountingtime" column="accountingtime"/>
     </resultMap>
 
     <sql id="selectWmsRawOrderInVo">
@@ -548,4 +556,36 @@
             order_no = #{userDefined6}
           AND material_code  like concat('%', #{materialCode}, '%')
     </select>
+    <select id="listInspectionReport"    resultMap="WmsRawOrderInResult">
+        SELECT DISTINCT
+            ods_procure_order.User_Defined5,
+            ods_procure_order.Procure_Code,
+            ods_procure_order.Material_Code material_code,
+            ods_procure_order.Material_Desc material_desc,
+            ods_procure_order.Operation_Number,
+            ods_procure_order.Create_By create_by,
+            ods_procure_order.Create_Date   ,
+            qc_check_task.create_time createtime,
+            qc_check_task.check_time checktime,
+            qc_check_task.check_man_code    checkManCode,
+            qc_check_task.check_man_name    checkManName,
+            wms_raw_order_in.accounting_time    accountingtime,
+            wms_raw_order_in.gmt_create,
+            wms_raw_order_in.receipt_operator
+        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="userDefined5 != null  and userDefined5 != ''">and ods_procure_order.User_Defined5 = #{userDefined5}</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>
+        ORDER BY
+            ods_procure_order.Create_Date DESC
+    </select>
 </mapper>