DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
砂糖
2026-03-30 13:13:49 +08:00
parent aacf433462 e553bfcb22
commit bb9252e3a2
12 changed files with 94 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-crm/src/main/java/com/klp/crm/domain/CrmCustomer.java
View File

@@ -56,6 +56,10 @@ public class CrmCustomer extends BaseEntity {
* 银行信息（多条，需权限查看，JSON格式存储）
*/
private String bankInfo;
/**
* 纳税人识别号/税号
*/
private String taxNumber;
/**
* 备注
*/

5
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmCustomerBo.java
View File

@@ -62,6 +62,11 @@ public class CrmCustomerBo extends BaseEntity {
*/
private String bankInfo;
/**
* 纳税人识别号/税号
*/
private String taxNumber;
/**
* 备注
*/

6
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmCustomerVo.java
View File

@@ -78,6 +78,12 @@ public class CrmCustomerVo {
@ExcelDictFormat(readConverterExp = "多=条，需权限查看，JSON格式存储")
private String bankInfo;
/**
* 纳税人识别号/税号
*/
@ExcelProperty(value = "纳税人识别号/税号")
private String taxNumber;
/**
* 备注
*/

1
klp-crm/src/main/java/com/klp/crm/service/impl/CrmCustomerServiceImpl.java
View File

@@ -69,6 +69,7 @@ public class CrmCustomerServiceImpl implements ICrmCustomerService {
lqw.eq(StringUtils.isNotBlank(bo.getCustomerLevel()), CrmCustomer::getCustomerLevel, bo.getCustomerLevel());
lqw.eq(StringUtils.isNotBlank(bo.getAddress()), CrmCustomer::getAddress, bo.getAddress());
lqw.eq(StringUtils.isNotBlank(bo.getBankInfo()), CrmCustomer::getBankInfo, bo.getBankInfo());
lqw.eq(StringUtils.isNotBlank(bo.getTaxNumber()), CrmCustomer::getTaxNumber, bo.getTaxNumber());
return lqw;
}

1
klp-crm/src/main/resources/mapper/CrmCustomerMapper.xml
View File

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="customerLevel" column="customer_level"/>
<result property="address" column="address"/>
<result property="bankInfo" column="bank_info"/>
<result property="taxNumber" column="tax_number"/>
<result property="remark" column="remark"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>

6
klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java
View File

@@ -31,6 +31,12 @@ public class WmsCoilAbnormal extends BaseEntity {
* 钢卷ID
*/
private Long coilId;
/**
* 产线名称
*/
private String productionLine;
/**
* 位置（上下，操作侧，中间，驱动侧）
*/

5
klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java
View File

@@ -30,6 +30,11 @@ public class WmsCoilAbnormalBo extends BaseEntity {
*/
private Long coilId;
/**
* 产线名称
*/
private String productionLine;
/**
* 位置（上下，操作侧，中间，驱动侧）
*/

6
klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java
View File

@@ -34,6 +34,12 @@ public class WmsCoilAbnormalVo {
@ExcelProperty(value = "钢卷ID")
private Long coilId;
/**
* 产线名称
*/
@ExcelProperty(value = "产线名称")
private String productionLine;
/**
* 位置（上下，操作侧，中间，驱动侧）
*/

39
klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
View File

@@ -217,4 +217,43 @@ public class WmsDeliveryWaybillDetailVo extends BaseEntity {
*/
private Date planDate;
// ==================== 原材料/产品信息 ====================
/**
* 物品名称（原材料/产品）
*/
private String itemName;
/**
* 物品规格（原材料/产品）
*/
private String itemSpecification;
/**
* 物品材质（原材料/产品）
*/
private String itemMaterial;
/**
* 厂家
*/
private String manufacturer;
/**
* 表面处理描述
*/
@ExcelProperty(value = "表面处理")
private String itemSurfaceTreatmentDesc;
/**
* 镀层
*/
@ExcelProperty(value = "镀层")
private String itemZincLayer;
/**
* 状态描述
*/
@ExcelProperty(value = "状态")
private String statusDesc;
}

1
klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java
View File

@@ -64,6 +64,7 @@ public class WmsCoilAbnormalServiceImpl implements IWmsCoilAbnormalService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsCoilAbnormal> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getCoilId() != null, WmsCoilAbnormal::getCoilId, bo.getCoilId());
lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsCoilAbnormal::getProductionLine, bo.getProductionLine());
lqw.eq(StringUtils.isNotBlank(bo.getPosition()), WmsCoilAbnormal::getPosition, bo.getPosition());
lqw.eq(bo.getLength() != null, WmsCoilAbnormal::getLength, bo.getLength());
lqw.eq(bo.getStartPosition() != null, WmsCoilAbnormal::getStartPosition, bo.getStartPosition());

1
klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml
View File

@@ -7,6 +7,7 @@
<resultMap type="com.klp.domain.WmsCoilAbnormal" id="WmsCoilAbnormalResult">
<result property="abnormalId" column="abnormal_id"/>
<result property="coilId" column="coil_id"/>
<result property="productionLine" column="production_line"/>
<result property="position" column="position"/>
<result property="length" column="length"/>
<result property="startPosition" column="start_position"/>

19
klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
View File

@@ -174,6 +174,14 @@
<result property="planId" column="plan_id"/>
<result property="planName" column="plan_name"/>
<result property="planDate" column="plan_date"/>
<!-- 原材料/产品信息 -->
<result property="itemName" column="item_name"/>
<result property="itemSpecification" column="item_specification"/>
<result property="itemMaterial" column="item_material"/>
<result property="manufacturer" column="item_manufacturer"/>
<result property="itemSurfaceTreatmentDesc" column="item_surface_treatment_desc"/>
<result property="itemZincLayer" column="item_zinc_layer"/>
</resultMap>
<select id="selectDetailVoList" resultMap="WmsDeliveryWaybillDetailVoResult">
@@ -183,6 +191,14 @@
c.enter_coil_no,
c.current_coil_no,
aw.actual_warehouse_name,
(CASE c.status WHEN 0 THEN '在库' WHEN 1 THEN '在途' WHEN 2 THEN '已出库' ELSE CAST(c.status AS CHAR) END) AS status_desc,
(CASE WHEN c.item_type = 'raw_material' THEN rm.raw_material_name WHEN c.item_type = 'product' THEN pdt.product_name ELSE NULL END) AS item_name,
(CASE WHEN c.item_type = 'raw_material' THEN rm.specification WHEN c.item_type = 'product' THEN pdt.specification ELSE NULL END) AS item_specification,
(CASE WHEN c.item_type = 'raw_material' THEN rm.material WHEN c.item_type = 'product' THEN pdt.material ELSE NULL END) AS item_material,
(CASE WHEN c.item_type = 'raw_material' THEN rm.manufacturer WHEN c.item_type = 'product' THEN pdt.manufacturer ELSE NULL END) AS item_manufacturer,
(CASE WHEN c.item_type = 'raw_material' THEN rm.surface_treatment_desc WHEN c.item_type = 'product' THEN pdt.surface_treatment_desc ELSE NULL END) AS item_surface_treatment_desc,
(CASE WHEN c.item_type = 'raw_material' THEN rm.zinc_layer WHEN c.item_type = 'product' THEN pdt.zinc_layer ELSE NULL END) AS item_zinc_layer,
w.waybill_no,
w.waybill_name,
@@ -203,6 +219,8 @@
FROM wms_delivery_waybill_detail d
LEFT JOIN wms_material_coil c ON c.coil_id = d.coil_id AND c.del_flag = 0
LEFT JOIN wms_actual_warehouse aw ON aw.actual_warehouse_id = c.actual_warehouse_id AND aw.del_flag = 0
LEFT JOIN wms_raw_material rm ON c.item_type = 'raw_material' AND c.item_id = rm.raw_material_id AND rm.del_flag = 0
LEFT JOIN wms_product pdt ON c.item_type = 'product' AND c.item_id = pdt.product_id AND pdt.del_flag = 0
LEFT JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0
LEFT JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0
WHERE d.del_flag = 0
@@ -247,4 +265,5 @@
</if>
</select>
</mapper>