Merge remote-tracking branch 'origin/master'
陈恒杰
5 months ago
commit
6c629a4d84
@ -0,0 +1,60 @@
|
||||
package com.op.sap.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class SapWBDemand {
|
||||
private String werks;///工厂
|
||||
private String matnr;//物料号
|
||||
private String maktx;//物料描述
|
||||
private Double menge;//数量
|
||||
private String meins;//单位
|
||||
private Date bedat;//最早的采购订单日期
|
||||
|
||||
public String getWerks() {
|
||||
return werks;
|
||||
}
|
||||
|
||||
public void setWerks(String werks) {
|
||||
this.werks = werks;
|
||||
}
|
||||
|
||||
public String getMatnr() {
|
||||
return matnr;
|
||||
}
|
||||
|
||||
public void setMatnr(String matnr) {
|
||||
this.matnr = matnr;
|
||||
}
|
||||
|
||||
public String getMaktx() {
|
||||
return maktx;
|
||||
}
|
||||
|
||||
public void setMaktx(String maktx) {
|
||||
this.maktx = maktx;
|
||||
}
|
||||
|
||||
public Double getMenge() {
|
||||
return menge;
|
||||
}
|
||||
|
||||
public void setMenge(Double menge) {
|
||||
this.menge = menge;
|
||||
}
|
||||
|
||||
public String getMeins() {
|
||||
return meins;
|
||||
}
|
||||
|
||||
public void setMeins(String meins) {
|
||||
this.meins = meins;
|
||||
}
|
||||
|
||||
public Date getBedat() {
|
||||
return bedat;
|
||||
}
|
||||
|
||||
public void setBedat(Date bedat) {
|
||||
this.bedat = bedat;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.op.sap.mapper;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SapDeviceMapper {
|
||||
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.op.sap.service;
|
||||
|
||||
import com.op.common.core.domain.R;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface SapDeviceService {
|
||||
|
||||
R sapZmesAnlaGet(Map paramMap);
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
package com.op.sap.service.impl;
|
||||
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.op.common.core.constant.Constants;
|
||||
import com.op.common.core.domain.R;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.common.core.utils.uuid.IdUtils;
|
||||
import com.op.sap.mapper.SapDeviceMapper;
|
||||
import com.op.sap.service.SapDeviceService;
|
||||
import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO;
|
||||
import com.sap.conn.jco.*;
|
||||
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.validation.Validator;
|
||||
import java.math.BigDecimal;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
@Service
|
||||
public class SapDeviceServiceImpl implements SapDeviceService {
|
||||
@Autowired
|
||||
private SapDeviceMapper sapDeviceMapper;
|
||||
@Autowired
|
||||
protected Validator validator;
|
||||
|
||||
@Autowired
|
||||
private JCoDestination dest;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(SapItemSyncImpl.class);
|
||||
|
||||
|
||||
@Override
|
||||
public R sapZmesAnlaGet(Map paramMap) {
|
||||
try {
|
||||
JCoRepository repository = dest.getRepository();
|
||||
JCoFunction func = repository.getFunction("ZMES_ANLA_GET");
|
||||
if (func == null) {
|
||||
throw new RuntimeException("Function does not exist in SAP");
|
||||
}
|
||||
log.info("设备同步参数-------" + paramMap.toString());
|
||||
//参数
|
||||
JCoParameterList jCoParameterList = func.getImportParameterList();
|
||||
jCoParameterList.setValue("P_SERNR", paramMap.get("P_SERNR"));
|
||||
func.execute(dest);//执行调用函数
|
||||
JCoTable maraTable = func.getTableParameterList().getTable("L_ANLA");
|
||||
for (int i = 0; i < maraTable.getNumRows(); i++) {
|
||||
maraTable.setRow(i);
|
||||
String BUKRS = maraTable.getString("BUKRS");
|
||||
String ANLN1 = maraTable.getString("ANLN1");
|
||||
String ANLN2 = maraTable.getString("ANLN2");
|
||||
String TXT50 = maraTable.getString("TXT50");
|
||||
String SERNR = maraTable.getString("SERNR");
|
||||
String INVZU = maraTable.getString("INVZU");
|
||||
System.out.println("公司代码"+BUKRS+"主资产号"+ANLN1+"资产次级编号"+ANLN2+"资产描述"+TXT50+"序列号"+SERNR+"补充库存说明"+INVZU);
|
||||
}
|
||||
return R.ok();
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage());
|
||||
return R.fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
package com.op.wms.domain;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Treeselect树结构实体类
|
||||
*
|
||||
* @author OP
|
||||
*/
|
||||
public class CascaderDTO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 节点ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
private String value;
|
||||
|
||||
/**
|
||||
* 节点名称
|
||||
*/
|
||||
private String label;
|
||||
|
||||
/**
|
||||
* 子节点
|
||||
*/
|
||||
private List<CascaderDTO> children;
|
||||
//
|
||||
// public TreeSelect() {
|
||||
//
|
||||
// }
|
||||
//
|
||||
// public TreeSelect(SysDept dept) {
|
||||
// this.id = dept.getDeptId();
|
||||
// this.label = dept.getDeptName();
|
||||
// this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
|
||||
// }
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
return label;
|
||||
}
|
||||
|
||||
public void setLabel(String label) {
|
||||
this.label = label;
|
||||
}
|
||||
|
||||
public List<CascaderDTO> getChildren() {
|
||||
return children;
|
||||
}
|
||||
|
||||
public void setChildren(List<CascaderDTO> children) {
|
||||
this.children = children;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,329 @@
|
||||
package com.op.wms.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 配料计划明细对象 pro_wet_material_plan_detail
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-27
|
||||
*/
|
||||
public class ProWetMaterialPlanDetail extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 计划工厂编码
|
||||
*/
|
||||
@Excel(name = "计划工厂编码")
|
||||
private String factoryCode;
|
||||
|
||||
/**
|
||||
* 配料计划id
|
||||
*/
|
||||
@Excel(name = "配料计划id")
|
||||
private String wetMaterialPlanId;
|
||||
|
||||
/**
|
||||
* 工单id
|
||||
*/
|
||||
@Excel(name = "工单id")
|
||||
private String workorderId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private String atrr1;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private String atrr2;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private String atrr3;
|
||||
|
||||
/**
|
||||
* 1接料完成0未接料
|
||||
*/
|
||||
@Excel(name = "是否接料", readConverterExp = "N=未接料,Y=已接料")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 料罐id
|
||||
*/
|
||||
private String bucketId;
|
||||
|
||||
/**
|
||||
* 料罐编码
|
||||
*/
|
||||
@Excel(name = "料罐编码")
|
||||
private String bucketCode;
|
||||
|
||||
/**
|
||||
* 物料编码
|
||||
*/
|
||||
private String materialCode;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
private String materialId;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
@Excel(name = "物料名称")
|
||||
private String materialName;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
@Excel(name = "产品名称")
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
* 班次id
|
||||
*/
|
||||
private Long shiftId;
|
||||
|
||||
/**
|
||||
* 班次编码
|
||||
*/
|
||||
private String shiftCode;
|
||||
|
||||
/**
|
||||
* 班次简称
|
||||
*/
|
||||
@Excel(name = "班次简称")
|
||||
private String shiftDesc;
|
||||
|
||||
/**
|
||||
* 计划日期
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "计划日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 1)
|
||||
private Date planTime;
|
||||
|
||||
// 工单编码
|
||||
private String workorderCode;
|
||||
|
||||
|
||||
// 工单日期
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date productDate;
|
||||
|
||||
// 料罐名称
|
||||
private String bucketName;
|
||||
|
||||
public String getBucketName() {
|
||||
return bucketName;
|
||||
}
|
||||
|
||||
public void setBucketName(String bucketName) {
|
||||
this.bucketName = bucketName;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getWetMaterialPlanId() {
|
||||
return wetMaterialPlanId;
|
||||
}
|
||||
|
||||
public void setWetMaterialPlanId(String wetMaterialPlanId) {
|
||||
this.wetMaterialPlanId = wetMaterialPlanId;
|
||||
}
|
||||
|
||||
public String getWorkorderId() {
|
||||
return workorderId;
|
||||
}
|
||||
|
||||
public void setWorkorderId(String workorderId) {
|
||||
this.workorderId = workorderId;
|
||||
}
|
||||
|
||||
public String getAtrr1() {
|
||||
return atrr1;
|
||||
}
|
||||
|
||||
public void setAtrr1(String atrr1) {
|
||||
this.atrr1 = atrr1;
|
||||
}
|
||||
|
||||
public String getAtrr2() {
|
||||
return atrr2;
|
||||
}
|
||||
|
||||
public void setAtrr2(String atrr2) {
|
||||
this.atrr2 = atrr2;
|
||||
}
|
||||
|
||||
public String getAtrr3() {
|
||||
return atrr3;
|
||||
}
|
||||
|
||||
public void setAtrr3(String atrr3) {
|
||||
this.atrr3 = atrr3;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getBucketId() {
|
||||
return bucketId;
|
||||
}
|
||||
|
||||
public void setBucketId(String bucketId) {
|
||||
this.bucketId = bucketId;
|
||||
}
|
||||
|
||||
public String getBucketCode() {
|
||||
return bucketCode;
|
||||
}
|
||||
|
||||
public void setBucketCode(String bucketCode) {
|
||||
this.bucketCode = bucketCode;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public String getMaterialId() {
|
||||
return materialId;
|
||||
}
|
||||
|
||||
public void setMaterialId(String materialId) {
|
||||
this.materialId = materialId;
|
||||
}
|
||||
|
||||
public String getMaterialName() {
|
||||
return materialName;
|
||||
}
|
||||
|
||||
public void setMaterialName(String materialName) {
|
||||
this.materialName = materialName;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public Long getShiftId() {
|
||||
return shiftId;
|
||||
}
|
||||
|
||||
public void setShiftId(Long shiftId) {
|
||||
this.shiftId = shiftId;
|
||||
}
|
||||
|
||||
public String getShiftCode() {
|
||||
return shiftCode;
|
||||
}
|
||||
|
||||
public void setShiftCode(String shiftCode) {
|
||||
this.shiftCode = shiftCode;
|
||||
}
|
||||
|
||||
public String getShiftDesc() {
|
||||
return shiftDesc;
|
||||
}
|
||||
|
||||
public void setShiftDesc(String shiftDesc) {
|
||||
this.shiftDesc = shiftDesc;
|
||||
}
|
||||
|
||||
public Date getPlanTime() {
|
||||
return planTime;
|
||||
}
|
||||
|
||||
public void setPlanTime(Date planTime) {
|
||||
this.planTime = planTime;
|
||||
}
|
||||
|
||||
public String getWorkorderCode() {
|
||||
return workorderCode;
|
||||
}
|
||||
|
||||
public void setWorkorderCode(String workorderCode) {
|
||||
this.workorderCode = workorderCode;
|
||||
}
|
||||
|
||||
public Date getProductDate() {
|
||||
return productDate;
|
||||
}
|
||||
|
||||
public void setProductDate(Date productDate) {
|
||||
this.productDate = productDate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("factoryCode", getFactoryCode())
|
||||
.append("wetMaterialPlanId", getWetMaterialPlanId())
|
||||
.append("workorderId", getWorkorderId())
|
||||
.append("atrr1", getAtrr1())
|
||||
.append("atrr2", getAtrr2())
|
||||
.append("atrr3", getAtrr3())
|
||||
.append("status", getStatus())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("bucketId", getBucketId())
|
||||
.append("bucketCode", getBucketCode())
|
||||
.append("materialCode", getMaterialCode())
|
||||
.append("materialId", getMaterialId())
|
||||
.append("materialName", getMaterialName())
|
||||
.append("productName", getProductName())
|
||||
.append("shiftId", getShiftId())
|
||||
.append("shiftCode", getShiftCode())
|
||||
.append("shiftDesc", getShiftDesc())
|
||||
.append("planTime", getPlanTime())
|
||||
.append("workorderCode", getWorkorderCode())
|
||||
.append("productDate", getProductDate())
|
||||
.append("bucketName", getBucketName())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package com.op.wms.mapper;
|
||||
|
||||
import com.op.wms.domain.CascaderDTO;
|
||||
import org.apache.ibatis.annotations.MapKey;
|
||||
|
||||
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 订单Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-13
|
||||
*/
|
||||
|
||||
public interface ProOrderMapper {
|
||||
|
||||
|
||||
@MapKey("value")
|
||||
Map<String, CascaderDTO> getEquipInfoByCodes(String equipCodes);
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package com.op.wms.mapper;
|
||||
|
||||
|
||||
import com.op.wms.domain.ProOrderWorkorder;
|
||||
import com.op.wms.domain.ProWetMaterialPlanDetail;
|
||||
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产工单Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-18
|
||||
*/
|
||||
|
||||
public interface ProOrderWorkorderMapper {
|
||||
|
||||
List<ProOrderWorkorder> selectProOrderWorkorderList999(ProOrderWorkorder proOrderWorkorder);
|
||||
|
||||
ProWetMaterialPlanDetail getWetMaterial(String workorderId);
|
||||
|
||||
List<ProOrderWorkorder> selectProOrderWorkorderList(ProOrderWorkorder proOrderWorkorder);
|
||||
|
||||
String selectRouteNameByRouteCode(String routeCode);
|
||||
|
||||
ProOrderWorkorder selectWorkOrderByCode(String code);
|
||||
}
|
||||
|
||||
@ -1,7 +1,12 @@
|
||||
package com.op.wms.mapper;
|
||||
|
||||
import com.op.wms.domain.ProOrderWorkorder;
|
||||
import com.op.wms.domain.ProWetMaterialPlanDetail;
|
||||
import com.op.wms.domain.WmsToWCSDTO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface WmsToWCSInterfaceMapper {
|
||||
WmsToWCSDTO selectWmsToWCSDTO(WmsToWCSDTO wcsdto);
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
<?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.op.wms.mapper.ProOrderMapper">
|
||||
|
||||
<select id="getEquipInfoByCodes" resultType="com.op.wms.domain.CascaderDTO">
|
||||
select equipment_code value,equipment_name label from base_equipment where equipment_code in
|
||||
('${equipCodes}')
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,169 @@
|
||||
<?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.op.wms.mapper.ProOrderWorkorderMapper">
|
||||
|
||||
<resultMap type="ProOrderWorkorder" id="ProOrderWorkorderResult">
|
||||
<result property="workorderId" column="workorder_id"/>
|
||||
<result property="workorderCode" column="workorder_code"/>
|
||||
<result property="workorderName" column="workorder_name"/>
|
||||
<result property="orderId" column="order_id"/>
|
||||
<result property="orderCode" column="order_code"/>
|
||||
<result property="productId" column="product_id"/>
|
||||
<result property="productCode" column="product_code"/>
|
||||
<result property="productName" column="product_name"/>
|
||||
<result property="productSpc" column="product_spc"/>
|
||||
<result property="unit" column="unit"/>
|
||||
<result property="quantityProduced" column="quantity_produced"/>
|
||||
<result property="quantitySplit" column="quantity_split"/>
|
||||
<result property="routeCode" column="route_code"/>
|
||||
<result property="prodLineCode" column="prod_line_code"/>
|
||||
<result property="productDate" column="product_date"/>
|
||||
<result property="shiftId" column="shift_id"/>
|
||||
<result property="parentOrder" column="parent_order"/>
|
||||
<result property="ancestors" column="ancestors"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="attr1" column="attr1"/>
|
||||
<result property="attr2" column="attr2"/>
|
||||
<result property="atrr2" column="atrr2"/>
|
||||
|
||||
<result property="attr3" column="attr3"/>
|
||||
<result property="attr4" column="attr4"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="prodType" column="prod_type"/>
|
||||
<result property="factoryCode" column="factory_code"/>
|
||||
<result property="endFlag" column="end_flag"/>
|
||||
<result property="carNum" column="car_num"/>
|
||||
<result property="sortNo" column="sort_no"/>
|
||||
<result property="workorderCodeSap" column="workorder_code_sap"/>
|
||||
<result property="pproductCode" column="pproductCode"/>
|
||||
<result property="pproductName" column="pproductName"/>
|
||||
<result property="pworkorderCodeSap" column="pworkorderCodeSap"/>
|
||||
<result property="materialCode" column="material_code"/>
|
||||
<result property="materialName" column="material_name"/>
|
||||
<result property="sapCode" column="sap_code"/>
|
||||
<result property="sapName" column="sap_Name"/>
|
||||
</resultMap>
|
||||
<select id="selectProOrderWorkorderList999" resultMap="ProOrderWorkorderResult">
|
||||
select pow.workorder_id, pow.workorder_code, pow.workorder_name, pow.order_id, pow.order_code, pow.product_id,
|
||||
pow.product_code, pow.product_name,pow.product_spc, pow.unit, pow.quantity_produced, pow.quantity_split,
|
||||
pow.route_code, pow.prod_line_code, pow.product_date,pow.shift_id, pow.parent_order, pow.ancestors, pow.status,
|
||||
pow.remark, pow.attr1, pow.attr2, pow.attr3, pow.attr4, pow.create_by, pow.create_time,
|
||||
pow.update_by, pow.update_time, pow.prod_type, pow.factory_code , pow.end_flag , pow.car_num,pow.sort_no,
|
||||
pow.workorder_code_sap
|
||||
from pro_order_workorder pow
|
||||
<where>
|
||||
<if test="workorderCode != null and workorderCode != ''">and pow.workorder_code like concat('%',
|
||||
#{workorderCode}, '%')
|
||||
</if>
|
||||
<if test="workorderName != null and workorderName != ''">and pow.workorder_name like concat('%',
|
||||
#{workorderName}, '%')
|
||||
</if>
|
||||
<if test="orderId != null and orderId != ''">and pow.order_id = #{orderId}</if>
|
||||
<if test="orderCode != null and orderCode != ''">and pow.order_code like concat('%', #{orderCode}, '%')
|
||||
</if>
|
||||
<if test="productId != null and productId != ''">and pow.product_id = #{productId}</if>
|
||||
<if test="productCode != null and productCode != ''">and pow.product_code like concat('%', #{productCode},
|
||||
'%')
|
||||
</if>
|
||||
<if test="productName != null and productName != ''">and pow.product_name like concat('%', #{productName},
|
||||
'%')
|
||||
</if>
|
||||
<if test="productSpc != null and productSpc != ''">and pow.product_spc = #{productSpc}</if>
|
||||
<if test="unit != null and unit != ''">and pow.unit = #{unit}</if>
|
||||
<if test="quantityProduced != null ">and pow.quantity_produced = #{quantityProduced}</if>
|
||||
<if test="quantitySplit != null ">and pow.quantity_split = #{quantitySplit}</if>
|
||||
<if test="routeCode != null and routeCode != ''">and pow.route_code = #{routeCode}</if>
|
||||
<if test="prodLineCode != null and prodLineCode != ''">and pow.prod_line_code = #{prodLineCode}</if>
|
||||
<if test="productDate != null ">and pow.product_date = #{productDate}</if>
|
||||
<if test="shiftId != null and shiftId != ''">and pow.shift_id = #{shiftId}</if>
|
||||
<if test="parentOrder != null and parentOrder != ''">and pow.parent_order = #{parentOrder}</if>
|
||||
<if test="ancestors != null and ancestors != ''">and pow.ancestors = #{ancestors}</if>
|
||||
<if test="status != null and status != ''">and pow.status = #{status}</if>
|
||||
<if test="statusArray != null and statusArray != ''">and pow.status in (${statusArray})</if>
|
||||
<if test="attr1 != null and attr1 != ''">and pow.attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''">and pow.attr2 = #{attr2}</if>
|
||||
<if test="attr3 != null and attr3 != ''">and pow.attr3 = #{attr3}</if>
|
||||
<if test="attr4 != null and attr4 != ''">and pow.attr4 = #{attr4}</if>
|
||||
<if test="prodType != null and prodType != ''">and pow.prod_type = #{prodType}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">and pow.factory_code = #{factoryCode}</if>
|
||||
<if test="endFlag != null and endFlag != ''">and pow.end_flag = #{endFlag}</if>
|
||||
<if test="productDateStart != null ">and CONVERT(varchar(10),pow.product_date, 120) >=
|
||||
'${productDateStart}'
|
||||
</if>
|
||||
<if test="productDateEnd != null ">and '${productDateEnd}%' >= CONVERT(varchar(10),pow.product_date, 120)
|
||||
</if>
|
||||
and pow.del_flag = '0'
|
||||
</where>
|
||||
order by pow.product_date desc
|
||||
</select>
|
||||
<sql id="selectProOrderWorkorderVo">
|
||||
select workorder_id, workorder_code, workorder_name, order_id, order_code, product_id, product_code, product_name,
|
||||
product_spc, unit, quantity_produced, quantity_split, route_code, prod_line_code, product_date,
|
||||
shift_id, parent_order, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time,
|
||||
update_by, update_time, prod_type, factory_code , end_flag , car_num,sort_no,workorder_code_sap
|
||||
from pro_order_workorder
|
||||
</sql>
|
||||
<select id="selectWorkOrderByCode" resultMap="ProOrderWorkorderResult">
|
||||
<include refid="selectProOrderWorkorderVo"/>
|
||||
where workorder_code = #{workorderCode}
|
||||
and del_flag = '0'
|
||||
</select>
|
||||
<select id="getWetMaterial" resultType="com.op.wms.domain.ProWetMaterialPlanDetail">
|
||||
select top 1 material_code materialCode,
|
||||
material_name materialName
|
||||
from pro_wet_material_plan_detail
|
||||
where workorder_id = #{workorderId} order by create_time desc
|
||||
</select>
|
||||
<select id="selectRouteNameByRouteCode" resultType="java.lang.String">
|
||||
select route_name from pro_route where route_code = #{routeCode}
|
||||
</select>
|
||||
<select id="selectProOrderWorkorderList" parameterType="ProOrderWorkorder" resultMap="ProOrderWorkorderResult">
|
||||
select pow.workorder_id, pow.workorder_code, pow.workorder_name, pow.order_id, pow.order_code,
|
||||
pow.product_code, pow.product_name,pow.product_spc, pow.unit, pow.quantity_split,
|
||||
pow.route_code, pow.prod_line_code, pow.product_date,
|
||||
pow.shift_id, pow.parent_order,pow.status, pow.prod_type,pow.factory_code,
|
||||
pow.end_flag,pow.car_num,pow.sort_no,
|
||||
pow.workorder_code_sap,
|
||||
ppow.product_code pproductCode,ppow.product_name pproductName,ppow.workorder_code_sap pworkorderCodeSap
|
||||
from pro_order_workorder pow
|
||||
left join pro_order_workorder ppow on pow.parent_order = ppow.workorder_code and ppow.del_flag = '0'
|
||||
<where>
|
||||
<if test="workorderCode != null and workorderCode != ''">and pow.workorder_code like concat('%',
|
||||
#{workorderCode}, '%')
|
||||
</if>
|
||||
<if test="workorderName != null and workorderName != ''">and pow.workorder_name like concat('%',
|
||||
#{workorderName}, '%')
|
||||
</if>
|
||||
<if test="orderId != null and orderId != ''">and pow.order_id = #{orderId}</if>
|
||||
<if test="orderCode != null and orderCode != ''">and pow.order_code like concat('%', #{orderCode}, '%')
|
||||
</if>
|
||||
<if test="productCode != null and productCode != ''">and ppow.product_code like concat('%', #{productCode},
|
||||
'%')
|
||||
</if>
|
||||
<if test="productName != null and productName != ''">and ppow.product_name like concat('%', #{productName},
|
||||
'%')
|
||||
</if>
|
||||
<if test="productDate != null ">and pow.product_date = #{productDate}</if>
|
||||
<if test="shiftId != null and shiftId != ''">and pow.shift_id = #{shiftId}</if>
|
||||
<if test="parentOrder != null and parentOrder != ''">and pow.parent_order = #{parentOrder}</if>
|
||||
<if test="status != null and status != ''">and pow.status = #{status}</if>
|
||||
<if test="statusArray != null and statusArray != ''">and pow.status in (${statusArray})</if>
|
||||
<if test="prodType != null and prodType != ''">and pow.prod_type = #{prodType}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">and pow.factory_code = #{factoryCode}</if>
|
||||
<if test="endFlag != null and endFlag != ''">and pow.end_flag = #{endFlag}</if>
|
||||
<if test="productDateStart != null ">and CONVERT(varchar(10),pow.product_date, 120) >=
|
||||
'${productDateStart}'
|
||||
</if>
|
||||
<if test="productDateEnd != null ">and '${productDateEnd}' >= CONVERT(varchar(10),pow.product_date, 120)
|
||||
</if>
|
||||
and pow.del_flag = '0'
|
||||
</where>
|
||||
order by pow.product_date desc
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue