煤种都存id

liding

3 天以前 946896c1cf0c81befeae145bb363e1a250defc0d

煤种都存id

 main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java

@@ -43,11 +43,6 @@
    @TableField(value = "coal_id")
    private Long coalId;
    /**
     * 煤种
     */
    @TableField(value = "coal")
    private String coal;
    /**
     * 单位
     */
    @TableField(value = "unit")

 main-business/src/main/java/com/ruoyi/business/entity/ProductionInventory.java

@@ -31,11 +31,7 @@
     */
    @TableField(value = "coal_id")
    private Long coalId;
    /**
     * 煤种
     */
    @TableField(value = "coal")
    private String coal;

    /**
     * 库存数量
     */

 main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java

@@ -28,11 +28,6 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * 煤种
     */
    @TableField(value = "coal")
    private String coal;
    /**
     * 煤种id
     */
    @TableField(value = "coal_id")

 main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java

@@ -220,7 +220,6 @@
        master.setLaborCost(totalLabor);
        master.setEnergyConsumptionCost(totalEnergy);
        master.setEquipmentDepreciation(totalDepreciation);
        master.setCoal(coalInfos.stream().map(CoalInfo::getCoal).collect(Collectors.joining(",")));
        master.setCoalId(coalIds.stream().map(String::valueOf).collect(Collectors.joining(",")));

        return master;

 main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java

@@ -88,7 +88,6 @@
                // 采购登记成功，同步创建待入库记录
                PendingInventory pendingInventory = createPendingInventory(purchaseRegistration);
                pendingInventory.setSupplierName(supply.getSupplierName());
                pendingInventory.setCoal(coalInfo.getCoal());
                return pendingInventoryMapper.insert(pendingInventory);
            }
            return insertCount;