# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
master
Yangwl 2 weeks ago
commit f3a345953c

@ -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;
}
}

@ -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'
<if test="machineName != null and machineName != ''">and sf.factory_name like concat('%', #{machineName}, '%')</if>
<if test="machineName != null and machineName != ''">and sf.equipment_name like concat('%', #{machineName}, '%')</if>
<if test="carName != null and carName != ''">and sf1.factory_name like concat('%', #{carName}, '%')</if>
<if test="workorderCode != null and workorderCode != ''">and mrw.workorder_code like concat('%', #{workorderCode}, '%')</if>
<if test="batch != null and batch != ''">and mrw.batch like concat('%', #{batch}, '%')</if>
<if test="factoryName != null and factoryName != ''">and sf2.factory_name like concat('%', #{factoryName}, '%')</if>
<if test="productCode != null and productCode != ''">and pow.product_code like concat('%', #{productCode}, '%')</if>
@ -224,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productDateStart != null "> and CONVERT(varchar(10),mrw.feedback_time, 120) >= #{productDateStart}</if>
<if test="productDateEnd != null "> and #{productDateEnd} >= CONVERT(varchar(10),mrw.feedback_time, 120)</if>
ORDER BY sf.equipment_name
</select>
<select id="getReportWork" resultType="com.op.mes.domain.MesReportWork">
select

@ -91,6 +91,9 @@ public class QcCheckSampleTask extends BaseEntity {
@Excel(name = "第三次检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private String thirdCheckTime;
/** 订单号 **/
private String orderNo;
public String getId() {
return id;
}
@ -242,4 +245,12 @@ public class QcCheckSampleTask extends BaseEntity {
public void setThirdCheckTime(String thirdCheckTime) {
this.thirdCheckTime = thirdCheckTime;
}
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
}

@ -46,4 +46,16 @@ public interface QcCheckSampleTaskMapper {
* **/
int batchInsertQcCheckSampleTask(List<QcCheckSampleTask> list);
/**
*
* **/
int insertQcCheckSampleTask(QcCheckSampleTask params);
/**
*
* **/
QcCheckSampleTask selectQcCheckSampleTask(QcCheckSampleTask params);
}

@ -99,6 +99,9 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
@Autowired
private QcCheckTaskUserMapper qcCheckTaskUserMapper;
@Autowired
private QcCheckSampleTaskMapper qcCheckSampleTaskMapper;
private static Pattern p2= Pattern.compile("<[^>]+>");
/**
@ -1178,6 +1181,36 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
//发送企业微信
this.sendWX(qcCheckTaskIncome);
}
//首检后新增留样检验任务
//判断是否是首检
if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())){
QcCheckSampleTask sampleTask = new QcCheckSampleTask();
sampleTask.setId(IdUtils.fastSimpleUUID());
sampleTask.setMaterialName(qcCheckTaskIncome.getMaterialName());
//来料编码
String incomeBatchNo = qcCheckTaskIncome.getIncomeBatchNo();
if (StringUtils.isNotBlank(incomeBatchNo)) {
if (incomeBatchNo.length() == 24){
//国内物料去掉前面时间
incomeBatchNo = incomeBatchNo.substring(9,24);
} else if (incomeBatchNo.length() < 24){
//海外物料取创建时间
incomeBatchNo = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,qcCheckTaskIncome.getCreateTime());
}
}
sampleTask.setIncomeBatchNo(incomeBatchNo);
sampleTask.setOrderNo(qcCheckTaskIncome.getOrderNo());
sampleTask.setCreateTime(qcCheckTaskIncome.getCreateTime());
//查询该物料是否留样
QcCheckSampleTask temp = qcCheckSampleTaskMapper.selectQcCheckSampleTask(sampleTask);
//未留样则进行留样
if(Objects.isNull(temp)){
qcCheckSampleTaskMapper.insertQcCheckSampleTask(sampleTask);
}
}
return 1 ;
}

@ -35,7 +35,7 @@
id,
material_name,
income_batch_no,
work_order_code_sap,
SUBSTRING ( pow.workorder_code_sap, 4, 12 ) AS work_order_code_sap,
sample_time,
sample_num,
sample_address,
@ -51,7 +51,8 @@
third_check_user_name,
third_check_result,
third_check_time
from qc_check_sample_task
from qc_check_sample_task task
left join pro_order_workorder pow ON pow.workorder_code = task.order_no
<where>
<if test="queryDate != null and queryDate != ''">
and CONVERT(VARCHAR(10), create_time ,23) <![CDATA[ = ]]> #{queryDate}
@ -66,10 +67,10 @@
and material_name like concat('%', #{materialName}, '%')
</if>
<if test="workOrderCodeSap != null and workOrderCodeSap != ''">
and work_order_code_sap <![CDATA[ = ]]> #{workOrderCodeSap}
and SUBSTRING ( pow.workorder_code_sap, 4, 12 ) <![CDATA[ = ]]> #{workOrderCodeSap}
</if>
</where>
order by sample_time desc,create_time desc
order by sample_time desc,task.create_time desc
</select>
@ -231,4 +232,29 @@
</insert>
<insert id="insertQcCheckSampleTask" parameterType="com.op.quality.domain.QcCheckSampleTask">
INSERT INTO qc_check_sample_task (
id,
material_name,
income_batch_no,
order_no,
create_time
)
VALUES
(
#{id},
#{materialName},
#{incomeBatchNo},
#{orderNo},
#{createTime}
)
</insert>
<select id="selectQcCheckSampleTask" parameterType="com.op.quality.domain.QcCheckSampleTask" resultType="com.op.quality.domain.QcCheckSampleTask">
SELECT id
FROM qc_check_sample_task
WHERE material_name = #{materialName} AND income_batch_no = #{incomeBatchNo} AND order_no = #{orderNo}
</select>
</mapper>

@ -69,5 +69,7 @@ public interface SapBaseProductMapper {
void UpdateSapZmesGetMchb(SapZmesGetMchb sapZmesGetMchb1);
void deleteSapOdsMateStorage();
void insertSapZmesGetMchb(SapZmesGetMchb sapZmesGetMchb1);
}

@ -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 {
}
}
}
}

@ -301,6 +301,11 @@
gmt_modified=getdate()
where storage_id=#{storageId}
</update>
<delete id="deleteSapOdsMateStorage">
delete from sap_ods_mate_storage_news
</delete>
<insert id="insertSapZmesGetMchb" parameterType="com.op.system.api.domain.sap.SapZmesGetMchb" >
insert into sap_ods_mate_storage_news
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -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
*/

@ -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)

@ -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;
}

@ -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;
}
}

@ -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;
}
}

@ -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);
}

@ -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);
}

@ -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);
}
}

@ -44,6 +44,7 @@
<result property="needDate" column="needDate"/>
<result property="returnNumber" column="Return_Number"/>
<result property="sapNumber" column="Sap_Number"/>
<result property="sort" column="sort"/>
</resultMap>
<sql id="pagination_tail">
limit #{page.pageOffset} , #{page.rows}
@ -1406,6 +1407,7 @@
</select>
<select id="selectOdsProcureReturnOrderListZC" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
SELECT
ROW_NUMBER ( ) OVER ( PARTITION BY Produce_Code ORDER BY Create_Date DESC ) AS sort,
Site_code,
ID,
Produce_Code,

@ -418,7 +418,8 @@
CLABS clabs,
CINSM cinsm,
CEINM ceinm,
CSPEM cspem
CSPEM cspem,
CASE WHEN gmt_modified IS NOT NULL THEN gmt_modified ELSE gmt_create END gmtModified
FROM
sap_ods_mate_storage_news
<where>

@ -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">
@ -191,6 +192,9 @@
<if test="lastModifiedBy != null and lastModifiedBy != ''">and wms_raw_order_in.last_modified_by = #{lastModifiedBy}</if>
<if test="gmtModified != null ">and wms_raw_order_in.gmt_modified = #{gmtModified}</if>
<if test="activeFlag != null and activeFlag != ''">and wms_raw_order_in.active_flag = #{activeFlag}</if>
<if test="activeFlag != null and activeFlag != ''">and wms_raw_order_in.active_flag = #{activeFlag}</if>
<if test="deliveryTimeStart != null and deliveryTimeStart != ''">and CONVERT(varchar(16), wms_raw_order_in.request_time, 120) >= #{deliveryTimeStart}</if>
<if test="deliveryTimeEnd != null and deliveryTimeEnd != ''">and #{deliveryTimeEnd} >= CONVERT(varchar(16), wms_raw_order_in.request_time, 120)</if>
</where>
ORDER BY wms_raw_order_in.gmt_create DESC
</select>
@ -567,6 +571,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 +590,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 +668,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>

Loading…
Cancel
Save