diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java
index fa4031229..c15da822b 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportProduction.java
@@ -31,6 +31,13 @@ public class MesReportProduction extends BaseEntity {
private String machineName;
@Excel(name = "订单编号")
private String orderCode;
+
+ @Excel(name = "工单号")
+ private String workorderCode;
+
+ @Excel(name = "批次号")
+ private String batch;
+
@Excel(name = "产品编码")
private String productCode;
@Excel(name = "产品名称")
@@ -183,4 +190,20 @@ public class MesReportProduction extends BaseEntity {
public void setProductDateEnd(String productDateEnd) {
this.productDateEnd = productDateEnd;
}
+
+ public String getWorkorderCode() {
+ return workorderCode;
+ }
+
+ public void setWorkorderCode(String workorderCode) {
+ this.workorderCode = workorderCode;
+ }
+
+ public String getBatch() {
+ return batch;
+ }
+
+ public void setBatch(String batch) {
+ this.batch = batch;
+ }
}
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index 53e999263..eeca0642e 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
@@ -203,6 +203,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sf1.factory_name carName,
sf.equipment_code machineCode,
sf.equipment_name machineName,
+ mrw.workorder_code workorderCode,
+ mrw.batch batch,
mrw.product_code productCode,
mrw.product_name productName,
mrw.quantity,
@@ -214,8 +216,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_factory sf1 on sf.workshop_code = sf1.factory_code
left join sys_factory sf2 on sf1.parent_id = sf2.factory_id
where mrw.parent_order = '0' and mrw.del_flag = '0'
- and sf.factory_name like concat('%', #{machineName}, '%')
+ and sf.equipment_name like concat('%', #{machineName}, '%')
and sf1.factory_name like concat('%', #{carName}, '%')
+ and mrw.workorder_code like concat('%', #{workorderCode}, '%')
+ and mrw.batch like concat('%', #{batch}, '%')
and sf2.factory_name like concat('%', #{factoryName}, '%')
and pow.product_code like concat('%', #{productCode}, '%')
@@ -224,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and CONVERT(varchar(10),mrw.feedback_time, 120) >= #{productDateStart}
and #{productDateEnd} >= CONVERT(varchar(10),mrw.feedback_time, 120)
+ ORDER BY sf.equipment_name
@@ -231,4 +232,29 @@
+
+ INSERT INTO qc_check_sample_task (
+ id,
+ material_name,
+ income_batch_no,
+ order_no,
+ create_time
+ )
+ VALUES
+ (
+ #{id},
+ #{materialName},
+ #{incomeBatchNo},
+ #{orderNo},
+ #{createTime}
+ )
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseProductMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseProductMapper.java
index 5e164d7e1..6a35261d8 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseProductMapper.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseProductMapper.java
@@ -69,5 +69,7 @@ public interface SapBaseProductMapper {
void UpdateSapZmesGetMchb(SapZmesGetMchb sapZmesGetMchb1);
+ void deleteSapOdsMateStorage();
+
void insertSapZmesGetMchb(SapZmesGetMchb sapZmesGetMchb1);
}
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
index 096ad1663..06a970a7a 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
@@ -17,32 +17,18 @@ import com.op.sap.mapper.SapBaseProductMapper;
import com.op.sap.service.SapItemSyncService;
import com.op.system.api.RemoteUserService;
import com.sap.conn.jco.*;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.print.*;
-import javax.print.attribute.HashPrintRequestAttributeSet;
-import javax.print.attribute.standard.Copies;
-import javax.print.attribute.standard.MediaSizeName;
import javax.validation.Validator;
-import java.awt.*;
-import java.awt.print.PageFormat;
-import java.awt.print.Printable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.List;
@Component
@Service
@@ -1348,9 +1334,15 @@ public class SapItemSyncImpl implements SapItemSyncService {
log.info("物料号:"+MATNR+"工厂:"+WERKS+"库存地点:"+LGORT+"批号:"+CHARG+"物料描述:"+MAKTX+"物料组:"+MATKL+
"基本计量单位:"+MEINS+"非限制库存:"+CLABS+"质检库存:"+CINSM+"限制库存:"+CEINM+"冻结库存:"+CSPEM);
}
+
+ //先删除数据后再插入
+ sapBaseProductMapper.deleteSapOdsMateStorage();
+
+ //批量插入数据
+
for (SapZmesGetMchb sapZmesGetMchb1:
sapZmesGetMchbs) {
- SapZmesGetMchb sapZmesGetMchb2=new SapZmesGetMchb();//
+ SapZmesGetMchb sapZmesGetMchb2=new SapZmesGetMchb();//
sapZmesGetMchb2.setMatnr(sapZmesGetMchb1.getMatnr());
sapZmesGetMchb2.setWerks(sapZmesGetMchb1.getWerks());
sapZmesGetMchb2.setLgort(sapZmesGetMchb1.getLgort());
@@ -1358,32 +1350,18 @@ public class SapItemSyncImpl implements SapItemSyncService {
sapZmesGetMchb2.setMaktx(sapZmesGetMchb1.getMaktx());
sapZmesGetMchb2.setMatkl(sapZmesGetMchb1.getMatkl());
sapZmesGetMchb2.setMeins(sapZmesGetMchb1.getMeins());
- SapZmesGetMchb sapZmesGetMchb3= sapBaseProductMapper.selectSapZmesGetMchb(sapZmesGetMchb2);
- if (sapZmesGetMchb3!=null){//修改
- sapZmesGetMchb1.setClabs(sapZmesGetMchb1.getClabs());
- sapZmesGetMchb1.setCinsm(sapZmesGetMchb1.getCinsm());
- sapZmesGetMchb1.setMeins(sapZmesGetMchb1.getMeins());
- sapZmesGetMchb1.setCeinm(sapZmesGetMchb1.getCeinm());
- sapZmesGetMchb1.setCspem(sapZmesGetMchb1.getCspem());
- sapZmesGetMchb1.setStorageId(sapZmesGetMchb3.getStorageId());
-
- sapZmesGetMchb1.setCreateBy("task");
- sapZmesGetMchb1.setGmtCreate(new Date());
- sapBaseProductMapper.UpdateSapZmesGetMchb(sapZmesGetMchb1);
- }else {//添加
- sapZmesGetMchb1.setStorageId(IdUtils.fastSimpleUUID());
- sapZmesGetMchb1.setClabs(sapZmesGetMchb1.getClabs());
- sapZmesGetMchb1.setCinsm(sapZmesGetMchb1.getCinsm());
- sapZmesGetMchb1.setMeins(sapZmesGetMchb1.getMeins());
- sapZmesGetMchb1.setCeinm(sapZmesGetMchb1.getCeinm());
- sapZmesGetMchb1.setCspem(sapZmesGetMchb1.getCspem());
- sapZmesGetMchb1.setCreateBy("task");
- sapZmesGetMchb1.setActiveFlag("1");
- sapZmesGetMchb1.setGmtCreate(new Date());
- sapZmesGetMchb1.setFactoryCode(sapZmesGetMchb1.getWerks());
- sapZmesGetMchb1.setSapFactoryCode(sapZmesGetMchb1.getWerks());
- sapBaseProductMapper.insertSapZmesGetMchb(sapZmesGetMchb1);
- }
+ sapZmesGetMchb1.setStorageId(IdUtils.fastSimpleUUID());
+ sapZmesGetMchb1.setClabs(sapZmesGetMchb1.getClabs());
+ sapZmesGetMchb1.setCinsm(sapZmesGetMchb1.getCinsm());
+ sapZmesGetMchb1.setMeins(sapZmesGetMchb1.getMeins());
+ sapZmesGetMchb1.setCeinm(sapZmesGetMchb1.getCeinm());
+ sapZmesGetMchb1.setCspem(sapZmesGetMchb1.getCspem());
+ sapZmesGetMchb1.setCreateBy("task");
+ sapZmesGetMchb1.setActiveFlag("1");
+ sapZmesGetMchb1.setGmtCreate(new Date());
+ sapZmesGetMchb1.setFactoryCode(sapZmesGetMchb1.getWerks());
+ sapZmesGetMchb1.setSapFactoryCode(sapZmesGetMchb1.getWerks());
+ sapBaseProductMapper.insertSapZmesGetMchb(sapZmesGetMchb1);
}
return R.ok();
} catch (Exception e) {
@@ -1394,5 +1372,5 @@ public class SapItemSyncImpl implements SapItemSyncService {
}
}
-}
+}
diff --git a/op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml b/op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml
index 6606f673f..8db2939d2 100644
--- a/op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml
+++ b/op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml
@@ -301,6 +301,11 @@
gmt_modified=getdate()
where storage_id=#{storageId}
+
+
+ delete from sap_ods_mate_storage_news
+
+
insert into sap_ods_mate_storage_news
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java
index dc200425f..64404c2b0 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java
+++ b/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 list = wmsRawOrderInService.getOrderCheckList(query);
+ ExcelUtil util = new ExcelUtil(OrderCheckVo.class);
+ util.exportExcel(response, list, "报检报表数据");
+ }
+
/**
* pda上查询包材到货单已暂时列表
*/
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java
index 6c5710b43..e95084351 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java
@@ -416,6 +416,11 @@ public class OdsProcureOutOrder extends BaseEntity {
private String waCode;
private String wlCode;
+ /**
+ * 序号
+ * **/
+ private String sort;
+
public String getWhCode() {
return whCode;
}
@@ -728,6 +733,14 @@ public class OdsProcureOutOrder extends BaseEntity {
return enterpriseCode;
}
+ public String getSort() {
+ return sort;
+ }
+
+ public void setSort(String sort) {
+ this.sort = sort;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java
index f3a5f2ade..550a1da4f 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java
+++ b/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;
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/query/OrderCheckQuery.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/query/OrderCheckQuery.java
new file mode 100644
index 000000000..a7197b9cb
--- /dev/null
+++ b/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;
+ }
+}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/vo/OrderCheckVo.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/vo/OrderCheckVo.java
new file mode 100644
index 000000000..90e6b66a8
--- /dev/null
+++ b/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;
+ }
+}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java
index a928030b2..3998a5d9b 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java
+++ b/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 getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn);
+ List getOrderCheckList(OrderCheckQuery query);
+
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java
index b0a868b10..560a3053f 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java
+++ b/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 getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn);
+
+ /**
+ * 获取报检报表列表
+ * **/
+ List getOrderCheckList(OrderCheckQuery query);
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java
index 958c9d635..e2f923ab8 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java
+++ b/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 getOrderCheckList(OrderCheckQuery query) {
+ return wmsRawOrderInMapper.getOrderCheckList(query);
+ }
}
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
index 094fa33e1..323bc8a7c 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
@@ -44,6 +44,7 @@
+