feat: 生产计划关联物料信息表

gongchunyi

3 天以前 423ac2a5e7e451248d8cdfc2cda3f32dba0ec8f8

feat: 生产计划关联物料信息表

 doc/ÄþÏÄ-ÖÐÊ¢½¨²Ä.sql

@@ -142,4 +142,11 @@
    `id`          int          NOT NULL AUTO_INCREMENT PRIMARY KEY,
    `config_type` varchar(50)  NOT NULL COMMENT '区分类型: MATERIAL_TYPE æˆ– INVENTORY_CAT',
    `config_name` varchar(100) NOT NULL COMMENT '显示的名称'
) ENGINE = InnoDB COMMENT ='物料信息表配置表';
) ENGINE = InnoDB COMMENT ='物料信息表配置表';

ALTER TABLE `production_plan`
    ADD COLUMN `product_material_id` int DEFAULT NULL COMMENT '关联物料信息表ID' AFTER `material_code`;

-- å»ºè®®é¡ºä¾¿åŠ ä¸Šç´¢å¼•ï¼Œæå‡å…³è”查询速度
ALTER TABLE `production_plan`
    ADD INDEX `idx_product_material_id` (`product_material_id`);

 src/main/java/com/ruoyi/production/pojo/ProductMaterial.java

@@ -43,9 +43,6 @@
    @ApiModelProperty("物料代码")
    private String materialCode;

    @ApiModelProperty("产品名称")
    private String productName;

    @ApiModelProperty("物料品名")
    private String materialName;


 src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java

@@ -65,6 +65,13 @@
    @Excel(name = "物料编码")
    private String materialCode;


    /**
     * å…³è”物料信息表ID
     */
    @ApiModelProperty("关联物料信息表ID")
    private Integer productMaterialId;

    /**
     * äº§å“åç§°
     */
@@ -233,6 +240,7 @@

    /**
     * è®¡ç®—剩余方数
     *
     * @return å‰©ä½™æ–¹æ•°
     */
    @ApiModelProperty(value = "剩余方数")

 src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java

@@ -15,7 +15,9 @@
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.AliDingConfig;
import com.ruoyi.production.pojo.ProductMaterial;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductMaterialService;
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.dto.ProductionPlanImportDto;
@@ -68,6 +70,9 @@

    @Autowired
    private ProductOrderPlanMapper productOrderPlanMapper;

    @Autowired
    private ProductMaterialService productMaterialService;

    /**
     * åŒæ­¥é”ï¼Œç¡®ä¿æ‰‹åŠ¨å’Œå®šæ—¶ä»»åŠ¡ä¸åŒæ—¶æ‰§è¡Œ
@@ -380,7 +385,19 @@
                plan.setApplyNo(formData.getString("textField_l7fytfco"));
                plan.setCustomerName(formData.getString("textField_lbkozohg"));

                plan.setMaterialCode(row.getString("textField_l9xo62q5"));
                String materialCode = row.getString("textField_l9xo62q5");
                plan.setMaterialCode(materialCode);

                // æ ¹æ®ç‰©æ–™ç¼–码查询物料信息表，关联物料ID
                if (StringUtils.isNotEmpty(materialCode)) {
                    LambdaQueryWrapper<ProductMaterial> queryWrapper = new LambdaQueryWrapper<>();
                    queryWrapper.eq(ProductMaterial::getMaterialCode, materialCode);
                    ProductMaterial productMaterial = productMaterialService.getOne(queryWrapper);
                    if (productMaterial != null) {
                        plan.setProductMaterialId(productMaterial.getId());
                    }
                }

                plan.setProductName(row.getString("textField_l9xo62q7"));
                plan.setProductSpec(row.getString("textField_l9xo62q8"));
                plan.setLength(row.getInteger("numberField_lb7lgatg_value"));

 src/main/resources/mapper/production/ProductMaterialMapper.xml

@@ -6,11 +6,10 @@
    <resultMap id="ProductMaterialResultMap" type="com.ruoyi.production.pojo.ProductMaterial">
        <id property="id" column="id"/>
        <result property="tenantId" column="tenant_id"/>
        <result property="materialType" column="material_type"/>
        <result property="inventoryCategory" column="inventory_category"/>
        <result property="materialTypeId" column="material_type_id"/>
        <result property="inventoryCategoryId" column="inventory_category_id"/>
        <result property="identifierCode" column="identifier_code"/>
        <result property="materialCode" column="material_code"/>
        <result property="productName" column="product_name"/>
        <result property="materialName" column="material_name"/>
        <result property="specification" column="specification"/>
        <result property="baseUnit" column="base_unit"/>

 src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml

@@ -12,6 +12,7 @@
        <result property="applyNo" column="apply_no"/>
        <result property="customerName" column="customer_name"/>
        <result property="materialCode" column="material_code"/>
        <result property="productMaterialId" column="product_material_id"/>
        <result property="productName" column="product_name"/>
        <result property="productSpec" column="product_spec"/>
        <result property="length" column="length"/>