质量问题修改

master
zhaoxiaolin 5 months ago
parent c3cc940ebc
commit d49b3b9bdd

@ -1384,6 +1384,9 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
dtos = proOrderWorkorderMapper.getPreIdCardListB(proOrderWorkorder);
dtos.get(0).setUmrez(dtos.get(0).getBatchQuantity().multiply(dtos.get(0).getUmrez()));//子单数量
}
for(ProOrderWorkorder pow:dtos){
pow.setProductCode(pow.getProductCode().substring(7));
}
return dtos;
}

@ -589,5 +589,12 @@ public class QcStaticTableController extends BaseController {
util.exportExcel(response, list, "巡检检验结果明细");
}
/**
* ----
**/
@GetMapping("/getDLTableMXList")
@Log(title = "定量值分析明细", businessType = BusinessType.QUERY)
public QcStaticTable getDLTableMXList(QcStaticTable qcStaticTable) {
return qcStaticTableService.getDLTableMXList(qcStaticTable);
}
}

@ -67,4 +67,6 @@ public interface IQcStaticTableService {
List<QcCheckDetail> exportIncomeDetail(QcStaticTable qcStaticTable);
List<QcCheckDetail> exportXJDetail(QcStaticTable qcStaticTable);
QcStaticTable getDLTableMXList(QcStaticTable qcStaticTable);
}

@ -188,6 +188,27 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
return qcStaticTableMapper.getXJDetail(qcStaticTable);
}
@Override
@DS("#header.poolName")
public QcStaticTable getDLTableMXList(QcStaticTable qcStaticTable) {
QcStaticTable dto = new QcStaticTable();
//第一列日期
List<String> days = this.getDays(qcStaticTable.getYmArrayStart(),
qcStaticTable.getYmArrayEnd(), "ymd");
qcStaticTable.setDataType("ymd");
// List<QcCheckTaskIncome> titleList = qcStaticTableMapper.getDLTableTitle(qcStaticTable);
// //表头:第一行
// List<String> colName1 = titleList.stream().map(QcStaticTable::getMaterialName).distinct().collect(Collectors.toList());
// dto.setTitleCol1(colName1);
//列表数据
List<HashMap> dxData = new ArrayList<>();
dto.setDxData(dxData);
return dto;
}
/**
* = (A*1+B*0.65+C*0.35)/
*
@ -728,18 +749,18 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
}
dto.setDxData(dxData);
//给折线图取上下限制
if(qcStaticTable.getProjectNoArray()!=null){
qcStaticTable.setProjectNo(qcStaticTable.getProjectNoArray()[0]);
QcStaticTable upandown = qcStaticTableMapper.getUpAndDown(qcStaticTable);
if(upandown!=null){
dto.setUpperDiff(upandown.getUpperDiff());
dto.setDownDiff(upandown.getDownDiff());
}else{
dto.setUpperDiff(BigDecimal.ZERO);
dto.setDownDiff(BigDecimal.ZERO);
}
}
// //给折线图取上下限制
// if(qcStaticTable.getProjectNoArray()!=null){
// qcStaticTable.setProjectNo(qcStaticTable.getProjectNoArray()[0]);
// QcStaticTable upandown = qcStaticTableMapper.getUpAndDown(qcStaticTable);
// if(upandown!=null){
// dto.setUpperDiff(upandown.getUpperDiff());
// dto.setDownDiff(upandown.getDownDiff());
// }else{
// dto.setUpperDiff(BigDecimal.ZERO);
// dto.setDownDiff(BigDecimal.ZERO);
// }
// }
return dto;
}
@ -1165,6 +1186,8 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
return days;
}
public static void main(String args[]){
String ymd = "1、0.4016";
System.out.println(ymd.substring(2));

@ -292,7 +292,7 @@
wms_fp_storage_news_sn.wh_code
) t
-->
select t0.orderNo,
<!--select t0.orderNo,
t0.materialCode,
t0.materialName,
t0.quality,
@ -300,7 +300,7 @@
t0.supplierCode,
t0.supplierName,
t0.check_Type
from (
from (-->
select t.order_no orderNo,
t.material_code materialCode,
t.material_name materialName,
@ -322,8 +322,9 @@
where bp.warehouse_cycle is not null and t.check_type in('checkTypeLL','checkTypeCP') and t.del_flag = '0'
<if test="materialCode != null">and t.material_code like concat('%',#{materialCode}, '%')</if>
<if test="materialName != null">and t.material_name like concat('%',#{materialName}, '%')</if>
)t0
where t0.days >= t0.warehouse_cycle
<!--
)t0
where t0.days >= t0.warehouse_cycle -->
</select>
<select id="getPutInOrderList" resultType="com.op.quality.domain.QcCheckTaskInventory">

@ -79,7 +79,7 @@ public class SapController extends BaseController {
*/
@PostMapping("/itemSync")
@Log(title = "同步SAP物料清单", businessType = BusinessType.SAP)
public R itemSync(@RequestBody SapItemQuery qo) {
public R itemSync() {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();

@ -128,7 +128,7 @@ public class BaseProduct extends BaseEntity {
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@Excel(name = "物料组名称", readConverterExp = "$column.readConverterExp()")
private String productGroupName;
/**
@ -152,19 +152,19 @@ public class BaseProduct extends BaseEntity {
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String userDefined4;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String userDefined5;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String userDefined6;
/**
@ -182,13 +182,13 @@ public class BaseProduct extends BaseEntity {
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String syncFlag;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String primaryUom;
/**
@ -205,13 +205,13 @@ public class BaseProduct extends BaseEntity {
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private BigDecimal basicOrder;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private BigDecimal convOrder;
/**
@ -223,13 +223,13 @@ public class BaseProduct extends BaseEntity {
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private BigDecimal basicIssue;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
//@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private BigDecimal convIssue;
/**
@ -346,17 +346,29 @@ public class BaseProduct extends BaseEntity {
@Excel(name = "其它")
private String other;
@Excel(name = "CPK品类")
private String otherName;
/**
*
*/
@Excel(name = "报工汇率")
private BigDecimal reportRate;
private String mvgr5Nm;
@Excel(name = "检验标准")
private String mvgr5;
private String palletNum;
private String warehouseCycle;
private String packType;
public String getOtherName() {
return otherName;
}
public void setOtherName(String otherName) {
this.otherName = otherName;
}
public String getPackType() {
return packType;
}

@ -32,7 +32,8 @@ public class BaseProductServiceImpl implements IBaseProductService {
@Override
@DS("#header.poolName")
public BaseProduct selectBaseProductByProductId(String productId) {
return baseProductMapper.selectBaseProductByProductId(productId);
BaseProduct dto = baseProductMapper.selectBaseProductByProductId(productId);
return dto;
}
/**
@ -44,7 +45,8 @@ public class BaseProductServiceImpl implements IBaseProductService {
@Override
@DS("#header.poolName")
public List<BaseProduct> selectBaseProductList(BaseProduct baseProduct) {
return baseProductMapper.selectBaseProductList(baseProduct);
List<BaseProduct> dtos = baseProductMapper.selectBaseProductList(baseProduct);
return dtos;
}
/**

@ -64,6 +64,8 @@
<result property="pvc" column="pvc"/>
<result property="supportPlate" column="support_plate"/>
<result property="other" column="other"/>
<result property="otherName" column="otherName"/>
<result property="reportRate" column="report_rate"/>
<result property="mvgr5" column="mvgr5"/>
<result property="mvgr5Nm" column="mvgr5_nm"/>
@ -75,59 +77,81 @@
</resultMap>
<sql id="selectBaseProductVo">
select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code,
parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume,
unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4,
user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag,
sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag,
append_percent, mtart, report_rate,mvgr5 from base_product
select bp.product_id,bp.product_code,bp.product_desc_zh,bp.product_model,bp.product_desc_en,bp.rule_code,bp.old_product_code,
bp.parts_product_code,bp.sku_barcode,bp.length,bp.width,bp.height,bp.gross_weight,bp.net_weight,bp.tare_weight,bp.volume,
bp.unit_price,bp.product_group,bp.product_group_name,bp.user_defined1,bp.user_defined2,bp.user_defined3,bp.user_defined4,
bp.user_defined5,bp.user_defined6,bp.create_by,bp.create_time,bp.update_by,bp.update_time,bp.factory_code,bp.active_flag,
bp.sync_flag,bp.primary_uom,bp.del_flag,bp.bstme,bp.basic_order,bp.conv_order,bp.ausme,bp.basic_issue,bp.conv_issue,bp.append_flag,
bp.append_percent,bp.mtart,bp.report_rate, bp.mvgr5,
bpa.id,
bpa.category,
bpa.pc,
bpa.iei,
bpa.man_standar,
bpa.spray_way,
bpa.blank_diameter,
bpa.blank_no,
bpa.spray_volume,
bpa.liquid_no,
bpa.endometrial_dosage,
bpa.outer_film_dosage,
bpa.support,
bpa.support_no,
bpa.pvc,
bpa.support_plate,
bpa.other,sdd.dict_label otherName,
bpa.warehouse_cycle,bpa.pallet_num palletNum,
bpa.pack_type
from base_product bp
left join base_product_attached bpa on bpa.product_code = right(bp.product_code,11)
left join lanju_op_cloud.dbo.sys_dict_data sdd on sdd.dict_value = bpa.other and sdd.dict_type= 'qms_category'
</sql>
<select id="selectBaseProductList" parameterType="BaseProduct" resultMap="BaseProductResult">
<include refid="selectBaseProductVo"/>
<where>
<if test="productCode != null and productCode != ''">and product_code like concat('%', #{productCode},'%')</if>
<if test="productDescZh != null and productDescZh != ''">and product_desc_zh like concat('%',#{productDescZh}, '%')</if>
<if test="productModel != null and productModel != ''">and product_model = #{productModel}</if>
<if test="productDescEn != null and productDescEn != ''">and product_desc_en = #{productDescEn}</if>
<if test="ruleCode != null and ruleCode != ''">and rule_code = #{ruleCode}</if>
<if test="oldProductCode != null and oldProductCode != ''">and old_product_code = #{oldProductCode}</if>
<if test="partsProductCode != null and partsProductCode != ''">and parts_product_code = #{partsProductCode}</if>
<if test="skuBarcode != null and skuBarcode != ''">and sku_barcode = #{skuBarcode}</if>
<if test="length != null ">and length = #{length}</if>
<if test="width != null ">and width = #{width}</if>
<if test="height != null ">and height = #{height}</if>
<if test="grossWeight != null ">and gross_weight = #{grossWeight}</if>
<if test="netWeight != null ">and net_weight = #{netWeight}</if>
<if test="tareWeight != null ">and tare_weight = #{tareWeight}</if>
<if test="volume != null ">and volume = #{volume}</if>
<if test="unitPrice != null ">and unit_price = #{unitPrice}</if>
<if test="productGroup != null and productGroup != ''">and product_group = #{productGroup}</if>
<if test="productGroupName != null and productGroupName != ''">and product_group_name like concat('%',#{productGroupName}, '%')</if>
<if test="userDefined1 != null and userDefined1 != ''">and user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''">and user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''">and user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''">and user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''">and user_defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''">and user_defined6 = #{userDefined6}</if>
<if test="factoryCode != null and factoryCode != ''">and factory_code = #{factoryCode}</if>
<if test="activeFlag != null and activeFlag != ''">and active_flag = #{activeFlag}</if>
<if test="syncFlag != null and syncFlag != ''">and sync_flag = #{syncFlag}</if>
<if test="primaryUom != null and primaryUom != ''">and primary_uom = #{primaryUom}</if>
<if test="bstme != null and bstme != ''">and bstme = #{bstme}</if>
<if test="basicOrder != null ">and basic_order = #{basicOrder}</if>
<if test="convOrder != null ">and conv_order = #{convOrder}</if>
<if test="ausme != null and ausme != ''">and ausme = #{ausme}</if>
<if test="basicIssue != null ">and basic_issue = #{basicIssue}</if>
<if test="convIssue != null ">and conv_issue = #{convIssue}</if>
<if test="appendFlag != null and appendFlag != ''">and append_flag = #{appendFlag}</if>
<if test="appendPercent != null and appendPercent != ''">and append_percent = #{appendPercent}</if>
<if test="mtart != null and mtart != ''">and mtart = #{mtart}</if>
<if test="reportRate != null and reportRate != ''">and report_rate = #{reportRate}</if>
<if test="mvgr5 != null and mvgr5 != ''">and mvgr5 like concat('%', #{mvgr5},'%') </if>
and del_flag = '0'
<if test="productCode != null and productCode != ''">and bp.product_code like concat('%', #{productCode},'%')</if>
<if test="productDescZh != null and productDescZh != ''">and bp.product_desc_zh like concat('%',#{productDescZh}, '%')</if>
<if test="productModel != null and productModel != ''">and bp.product_model = #{productModel}</if>
<if test="productDescEn != null and productDescEn != ''">and bp.product_desc_en = #{productDescEn}</if>
<if test="ruleCode != null and ruleCode != ''">and bp.rule_code = #{ruleCode}</if>
<if test="oldProductCode != null and oldProductCode != ''">and bp.old_product_code = #{oldProductCode}</if>
<if test="partsProductCode != null and partsProductCode != ''">and bp.parts_product_code = #{partsProductCode}</if>
<if test="skuBarcode != null and skuBarcode != ''">and bp.sku_barcode = #{skuBarcode}</if>
<if test="length != null ">and bp.length = #{length}</if>
<if test="width != null ">and bp.width = #{width}</if>
<if test="height != null ">and bp.height = #{height}</if>
<if test="grossWeight != null ">and bp.gross_weight = #{grossWeight}</if>
<if test="netWeight != null ">and bp.net_weight = #{netWeight}</if>
<if test="tareWeight != null ">and bp.tare_weight = #{tareWeight}</if>
<if test="volume != null ">and bp.volume = #{volume}</if>
<if test="unitPrice != null ">and bp.unit_price = #{unitPrice}</if>
<if test="productGroup != null and productGroup != ''">and bp.product_group = #{productGroup}</if>
<if test="productGroupName != null and productGroupName != ''">and bp.product_group_name like concat('%',#{productGroupName}, '%')</if>
<if test="userDefined1 != null and userDefined1 != ''">and bp.user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''">and bp.user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''">and bp.user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''">and bp.user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''">and bp.user_defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''">and bp.user_defined6 = #{userDefined6}</if>
<if test="factoryCode != null and factoryCode != ''">and bp.factory_code = #{factoryCode}</if>
<if test="activeFlag != null and activeFlag != ''">and bp.active_flag = #{activeFlag}</if>
<if test="syncFlag != null and syncFlag != ''">and bp.sync_flag = #{syncFlag}</if>
<if test="primaryUom != null and primaryUom != ''">and bp.primary_uom = #{primaryUom}</if>
<if test="bstme != null and bstme != ''">and bp.bstme = #{bstme}</if>
<if test="basicOrder != null ">and bp.basic_order = #{basicOrder}</if>
<if test="convOrder != null ">and bp.conv_order = #{convOrder}</if>
<if test="ausme != null and ausme != ''">and bp.ausme = #{ausme}</if>
<if test="basicIssue != null ">and bp.basic_issue = #{basicIssue}</if>
<if test="convIssue != null ">and bp.conv_issue = #{convIssue}</if>
<if test="appendFlag != null and appendFlag != ''">and bp.append_flag = #{appendFlag}</if>
<if test="appendPercent != null and appendPercent != ''">and bp.append_percent = #{appendPercent}</if>
<if test="mtart != null and mtart != ''">and bp.mtart = #{mtart}</if>
<if test="reportRate != null and reportRate != ''">and bp.report_rate = #{reportRate}</if>
<if test="mvgr5 != null and mvgr5 != ''">and bp.mvgr5 like concat('%', #{mvgr5},'%') </if>
and bp.del_flag = '0'
</where>
order by product_code asc
order by bp.product_code asc
</select>
<select id="selectBaseProductByProductId" parameterType="String" resultMap="BaseProductResult">

Loading…
Cancel
Save