Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-admin/src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ klp:
 
 --- # sql-server-api 中间件配置（生产环境）
 sql-server-api:
-  host: 192.168.0.219
+  host: 140.143.206.120
   port: 15000
   base-url: http://${sql-server-api.host}:${sql-server-api.port}
 

klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java

@@ -80,12 +80,12 @@ public class ApsPlanDetailBo extends BaseEntity {
     /**
      * 原料信息:厚度mm
      */
-    private BigDecimal rawThick;
+    private String rawThick;
 
     /**
      * 原料信息:宽度mm
      */
-    private BigDecimal rawWidth;
+    private String rawWidth;
 
     /**
      * 原料钢卷ID
@@ -135,22 +135,22 @@ public class ApsPlanDetailBo extends BaseEntity {
     /**
      * 成品信息:镀层g
      */
-    private BigDecimal coatingG;
+    private String coatingG;
 
     /**
      * 成品信息:成品宽度
      */
-    private BigDecimal productWidth;
+    private String productWidth;
 
     /**
      * 成品信息:轧制厚度
      */
-    private BigDecimal rollingThick;
+    private String rollingThick;
 
     /**
      * 成品信息:标签厚度
      */
-    private BigDecimal markCoatThick;
+    private String markCoatThick;
 
     /**
      * 成品信息:吨钢长度区间m

klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java

@@ -67,11 +67,11 @@ public class ApsPlanDetail extends BaseEntity {
     /**
      * 原料信息:厚度mm
      */
-    private BigDecimal rawThick;
+    private String rawThick;
     /**
      * 原料信息:宽度mm
      */
-    private BigDecimal rawWidth;
+    private String rawWidth;
     /**
      * 原料钢卷ID
      */
@@ -111,19 +111,19 @@ public class ApsPlanDetail extends BaseEntity {
     /**
      * 成品信息:镀层g
      */
-    private BigDecimal coatingG;
+    private String coatingG;
     /**
      * 成品信息:成品宽度
      */
-    private BigDecimal productWidth;
+    private String productWidth;
     /**
      * 成品信息:轧制厚度
      */
-    private BigDecimal rollingThick;
+    private String rollingThick;
     /**
      * 成品信息:标签厚度
      */
-    private BigDecimal markCoatThick;
+    private String markCoatThick;
     /**
      * 成品信息:吨钢长度区间m
      */

klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java

@@ -87,13 +87,13 @@ public class ApsPlanDetailVo {
      * 原料信息:厚度mm
      */
     @ExcelProperty(value = "原料信息:厚度mm")
-    private BigDecimal rawThick;
+    private String rawThick;
 
     /**
      * 原料信息:宽度mm
      */
     @ExcelProperty(value = "原料信息:宽度mm")
-    private BigDecimal rawWidth;
+    private String rawWidth;
 
     /**
      * 原料钢卷ID
@@ -153,25 +153,25 @@ public class ApsPlanDetailVo {
      * 成品信息:镀层g
      */
     @ExcelProperty(value = "成品信息:镀层g")
-    private BigDecimal coatingG;
+    private String coatingG;
 
     /**
      * 成品信息:成品宽度
      */
     @ExcelProperty(value = "成品信息:成品宽度")
-    private BigDecimal productWidth;
+    private String productWidth;
 
     /**
      * 成品信息:轧制厚度
      */
     @ExcelProperty(value = "成品信息:轧制厚度")
-    private BigDecimal rollingThick;
+    private String rollingThick;
 
     /**
      * 成品信息:标签厚度
      */
     @ExcelProperty(value = "成品信息:标签厚度")
-    private BigDecimal markCoatThick;
+    private String markCoatThick;
 
     /**
      * 成品信息:吨钢长度区间m

klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java

@@ -73,8 +73,8 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
         qw.eq(StringUtils.isNotBlank(bo.getSalesman()), "d.salesman", bo.getSalesman());
         qw.eq(StringUtils.isNotBlank(bo.getRawManufacturer()), "d.raw_manufacturer", bo.getRawManufacturer());
         qw.eq(StringUtils.isNotBlank(bo.getRawMaterial()), "d.raw_material", bo.getRawMaterial());
-        qw.eq(bo.getRawThick() != null, "d.raw_thick", bo.getRawThick());
+        qw.eq(StringUtils.isNotBlank(bo.getRawThick()), "d.raw_thick", bo.getRawThick());
-        qw.eq(bo.getRawWidth() != null, "d.raw_width", bo.getRawWidth());
+        qw.eq(StringUtils.isNotBlank(bo.getRawWidth()), "d.raw_width", bo.getRawWidth());
         qw.eq(bo.getRawMaterialId() != null, "d.raw_material_id", bo.getRawMaterialId());
         qw.eq(StringUtils.isNotBlank(bo.getRawCoilNos()), "d.raw_coil_nos", bo.getRawCoilNos());
         qw.eq(StringUtils.isNotBlank(bo.getRawLocation()), "d.raw_location", bo.getRawLocation());
@@ -84,10 +84,10 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
         qw.eq(bo.getRawNetWeight() != null, "d.raw_net_weight", bo.getRawNetWeight());
         qw.like(StringUtils.isNotBlank(bo.getProductName()), "d.product_name", bo.getProductName());
         qw.eq(StringUtils.isNotBlank(bo.getProductMaterial()), "d.product_material", bo.getProductMaterial());
-        qw.eq(bo.getCoatingG() != null, "d.coating_g", bo.getCoatingG());
+        qw.eq(StringUtils.isNotBlank(bo.getCoatingG()), "d.coating_g", bo.getCoatingG());
-        qw.eq(bo.getProductWidth() != null, "d.product_width", bo.getProductWidth());
+        qw.eq(StringUtils.isNotBlank(bo.getProductWidth()), "d.product_width", bo.getProductWidth());
-        qw.eq(bo.getRollingThick() != null, "d.rolling_thick", bo.getRollingThick());
+        qw.eq(StringUtils.isNotBlank(bo.getRollingThick()), "d.rolling_thick", bo.getRollingThick());
-        qw.eq(bo.getMarkCoatThick() != null, "d.mark_coat_thick", bo.getMarkCoatThick());
+        qw.eq(StringUtils.isNotBlank(bo.getMarkCoatThick()), "d.mark_coat_thick", bo.getMarkCoatThick());
         qw.eq(StringUtils.isNotBlank(bo.getTonSteelLengthRange()), "d.ton_steel_length_range", bo.getTonSteelLengthRange());
         qw.eq(bo.getPlanQty() != null, "d.plan_qty", bo.getPlanQty());
         qw.eq(bo.getPlanWeight() != null, "d.plan_weight", bo.getPlanWeight());
@@ -140,8 +140,8 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
         lqw.eq(StringUtils.isNotBlank(bo.getSalesman()), ApsPlanDetail::getSalesman, bo.getSalesman());
         lqw.eq(StringUtils.isNotBlank(bo.getRawManufacturer()), ApsPlanDetail::getRawManufacturer, bo.getRawManufacturer());
         lqw.eq(StringUtils.isNotBlank(bo.getRawMaterial()), ApsPlanDetail::getRawMaterial, bo.getRawMaterial());
-        lqw.eq(bo.getRawThick() != null, ApsPlanDetail::getRawThick, bo.getRawThick());
+        lqw.eq(StringUtils.isNotBlank(bo.getRawThick()), ApsPlanDetail::getRawThick, bo.getRawThick());
-        lqw.eq(bo.getRawWidth() != null, ApsPlanDetail::getRawWidth, bo.getRawWidth());
+        lqw.eq(StringUtils.isNotBlank(bo.getRawWidth()), ApsPlanDetail::getRawWidth, bo.getRawWidth());
         lqw.eq(bo.getRawMaterialId() != null, ApsPlanDetail::getRawMaterialId, bo.getRawMaterialId());
         lqw.eq(StringUtils.isNotBlank(bo.getRawCoilNos()), ApsPlanDetail::getRawCoilNos, bo.getRawCoilNos());
         lqw.eq(StringUtils.isNotBlank(bo.getRawLocation()), ApsPlanDetail::getRawLocation, bo.getRawLocation());
@@ -151,10 +151,10 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
         lqw.eq(bo.getRawNetWeight() != null, ApsPlanDetail::getRawNetWeight, bo.getRawNetWeight());
         lqw.like(StringUtils.isNotBlank(bo.getProductName()), ApsPlanDetail::getProductName, bo.getProductName());
         lqw.eq(StringUtils.isNotBlank(bo.getProductMaterial()), ApsPlanDetail::getProductMaterial, bo.getProductMaterial());
-        lqw.eq(bo.getCoatingG() != null, ApsPlanDetail::getCoatingG, bo.getCoatingG());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoatingG()), ApsPlanDetail::getCoatingG, bo.getCoatingG());
-        lqw.eq(bo.getProductWidth() != null, ApsPlanDetail::getProductWidth, bo.getProductWidth());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductWidth()), ApsPlanDetail::getProductWidth, bo.getProductWidth());
-        lqw.eq(bo.getRollingThick() != null, ApsPlanDetail::getRollingThick, bo.getRollingThick());
+        lqw.eq(StringUtils.isNotBlank(bo.getRollingThick()), ApsPlanDetail::getRollingThick, bo.getRollingThick());
-        lqw.eq(bo.getMarkCoatThick() != null, ApsPlanDetail::getMarkCoatThick, bo.getMarkCoatThick());
+        lqw.eq(StringUtils.isNotBlank(bo.getMarkCoatThick()), ApsPlanDetail::getMarkCoatThick, bo.getMarkCoatThick());
         lqw.eq(StringUtils.isNotBlank(bo.getTonSteelLengthRange()), ApsPlanDetail::getTonSteelLengthRange, bo.getTonSteelLengthRange());
         lqw.eq(bo.getPlanQty() != null, ApsPlanDetail::getPlanQty, bo.getPlanQty());
         lqw.eq(bo.getPlanWeight() != null, ApsPlanDetail::getPlanWeight, bo.getPlanWeight());

klp-crm/src/main/java/com/klp/crm/domain/CrmSalesObjection.java

@@ -81,6 +81,11 @@ public class CrmSalesObjection extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date returnDate;
 
+    /**
+     * 钢卷ID集合（多个用逗号分隔）
+     */
+    private String coilIds;
+
     /**
      * 投诉情况
      */

klp-crm/src/main/java/com/klp/crm/domain/bo/CrmSalesObjectionBo.java

@@ -100,4 +100,9 @@ public class CrmSalesObjectionBo extends BaseEntity {
      */
     private String customerDemand;
 
+    /**
+     * 钢卷ID集合（多个用逗号分隔）
+     */
+    private String coilIds;
+
 }

klp-crm/src/main/java/com/klp/crm/domain/vo/CrmSalesObjectionVo.java

@@ -1,6 +1,7 @@
 package com.klp.crm.domain.vo;
 
 import java.util.Date;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -122,4 +123,14 @@ public class CrmSalesObjectionVo {
     @ExcelProperty(value = "客户诉求")
     private String customerDemand;
 
+    /**
+     * 钢卷ID集合（多个用逗号分隔）
+     */
+    private String coilIds;
+
+    /**
+     * 钢卷信息列表
+     */
+    private List<com.klp.domain.vo.WmsMaterialCoilVo> coilList;
+
 }

klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesObjectionServiceImpl.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
+import com.klp.domain.bo.WmsMaterialCoilBo;
+import com.klp.domain.vo.WmsMaterialCoilVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.crm.domain.bo.CrmSalesObjectionBo;
@@ -14,10 +16,12 @@ import com.klp.crm.domain.vo.CrmSalesObjectionVo;
 import com.klp.crm.domain.CrmSalesObjection;
 import com.klp.crm.mapper.CrmSalesObjectionMapper;
 import com.klp.crm.service.ICrmSalesObjectionService;
+import com.klp.service.IWmsMaterialCoilService;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.ArrayList;
 
 /**
  * 销售异议管理Service业务层处理
@@ -30,13 +34,21 @@ import java.util.Collection;
 public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
 
     private final CrmSalesObjectionMapper baseMapper;
+    private final IWmsMaterialCoilService wmsMaterialCoilService;
 
     /**
      * 查询销售异议管理
      */
     @Override
     public CrmSalesObjectionVo queryById(String objectionId){
-        return baseMapper.selectVoById(objectionId);
+        CrmSalesObjectionVo vo = baseMapper.selectVoById(objectionId);
+        if (vo != null && StringUtils.isNotBlank(vo.getCoilIds())) {
+            com.klp.domain.bo.WmsMaterialCoilBo coilBo = new com.klp.domain.bo.WmsMaterialCoilBo();
+            coilBo.setCoilIds(vo.getCoilIds());
+            List<com.klp.domain.vo.WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
+            vo.setCoilList(coilList);
+        }
+        return vo;
     }
 
     /**
@@ -46,6 +58,17 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
     public TableDataInfo<CrmSalesObjectionVo> queryPageList(CrmSalesObjectionBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<CrmSalesObjection> lqw = buildQueryWrapper(bo);
         Page<CrmSalesObjectionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+
+        // 查询钢卷信息并填充到VO中
+        for (CrmSalesObjectionVo vo : result.getRecords()) {
+            if (StringUtils.isNotBlank(vo.getCoilIds())) {
+                WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo();
+                coilBo.setCoilIds(vo.getCoilIds());
+                List<WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
+                vo.setCoilList(coilList);
+            }
+        }
+
         return TableDataInfo.build(result);
     }
 
@@ -55,7 +78,19 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
     @Override
     public List<CrmSalesObjectionVo> queryList(CrmSalesObjectionBo bo) {
         LambdaQueryWrapper<CrmSalesObjection> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<CrmSalesObjectionVo> resultList = baseMapper.selectVoList(lqw);
+
+        // 查询钢卷信息并填充到VO中
+        for (CrmSalesObjectionVo vo : resultList) {
+            if (StringUtils.isNotBlank(vo.getCoilIds())) {
+                com.klp.domain.bo.WmsMaterialCoilBo coilBo = new com.klp.domain.bo.WmsMaterialCoilBo();
+                coilBo.setCoilIds(vo.getCoilIds());
+                List<com.klp.domain.vo.WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
+                vo.setCoilList(coilList);
+            }
+        }
+
+        return resultList;
     }
 
     private LambdaQueryWrapper<CrmSalesObjection> buildQueryWrapper(CrmSalesObjectionBo bo) {
@@ -75,6 +110,7 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
         lqw.eq(bo.getReturnDate() != null, CrmSalesObjection::getReturnDate, bo.getReturnDate());
         lqw.like(StringUtils.isNotBlank(bo.getComplaintContent()), CrmSalesObjection::getComplaintContent, bo.getComplaintContent());
         lqw.like(StringUtils.isNotBlank(bo.getCustomerDemand()), CrmSalesObjection::getCustomerDemand, bo.getCustomerDemand());
+        lqw.like(StringUtils.isNotBlank(bo.getCoilIds()), CrmSalesObjection::getCoilIds, bo.getCoilIds());
         return lqw;
     }
 

klp-crm/src/main/resources/mapper/CrmSalesObjectionMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
         <result property="productCategory" column="product_category"/>
         <result property="returnDate" column="return_date"/>
+        <result property="coilIds" column="coilIds"/>
         <result property="complaintContent" column="complaint_content"/>
         <result property="customerDemand" column="customer_demand"/>
         <result property="createBy" column="create_by"/>

klp-mes/src/main/java/com/klp/mes/qc/domain/WmsInspectionItemTemplate.java

@@ -36,6 +36,10 @@ public class WmsInspectionItemTemplate extends BaseEntity {
      * 待检项（可存储单个待检项或待检项编码，多个可拆分或用JSON）
      */
     private String inspectionItem;
+    /**
+     * 单位
+     */
+    private String templateUnit;
     /**
      * 逻辑删除标识：0=正常，1=已删
      */

klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsInspectionItemTemplateBo.java

@@ -37,6 +37,11 @@ public class WmsInspectionItemTemplateBo extends BaseEntity {
      */
     private String inspectionItem;
 
+    /**
+     * 单位
+     */
+    private String templateUnit;
+
     /**
      * 备注
      */

klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsInspectionItemTemplateVo.java

@@ -46,6 +46,12 @@ public class WmsInspectionItemTemplateVo {
     @ExcelDictFormat(readConverterExp = "可=存储单个待检项或待检项编码，多个可拆分或用JSON")
     private String inspectionItem;
 
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String templateUnit;
+
     /**
      * 备注
      */

klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsInspectionItemTemplateServiceImpl.java

@@ -74,6 +74,7 @@ public class WmsInspectionItemTemplateServiceImpl implements IWmsInspectionItemT
         lqw.like(StringUtils.isNotBlank(bo.getTemplateName()), WmsInspectionItemTemplate::getTemplateName, bo.getTemplateName());
         lqw.eq(StringUtils.isNotBlank(bo.getTemplateDesc()), WmsInspectionItemTemplate::getTemplateDesc, bo.getTemplateDesc());
         lqw.eq(StringUtils.isNotBlank(bo.getInspectionItem()), WmsInspectionItemTemplate::getInspectionItem, bo.getInspectionItem());
+        lqw.eq(StringUtils.isNotBlank(bo.getTemplateUnit()), WmsInspectionItemTemplate::getTemplateUnit, bo.getTemplateUnit());
         return lqw;
     }
 

klp-mes/src/main/resources/mapper/qc/WmsInspectionItemTemplateMapper.xml

@@ -9,6 +9,7 @@
         <result property="templateName" column="template_name"/>
         <result property="templateDesc" column="template_desc"/>
         <result property="inspectionItem" column="inspection_item"/>
+        <result property="templateUnit" column="template_unit"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>