[delete]

删除旧版无用的入库物料表warehousing_in_detail和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据

ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/OutboundDetailController.java

@@ -1,11 +1,9 @@
 package com.ruoyi.storehouse.controller;
 
-import java.sql.SQLOutput;
 import java.util.List;
 import java.util.Objects;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.storehouse.domain.WarehousingInDetail;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInDetailController.java

@@ -1,164 +0,0 @@
-package com.ruoyi.storehouse.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.storehouse.domain.WarehousingInDetail;
-import com.ruoyi.storehouse.service.IWarehousingInDetailService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-import static com.ruoyi.common.core.domain.AjaxResult.Type.SUCCESS;
-
-/**
- * 入库物料Controller
- * 
- * @author ruoyi
- * @date 2023-04-27
- */
-@Controller
-@RequestMapping("/storehouse/warehousingInDetail")
-public class WarehousingInDetailController extends BaseController
-{
-    private String prefix = "storehouse/warehousingInDetail";
-
-    @Autowired
-    private IWarehousingInDetailService warehousingInDetailService;
-
-    @RequiresPermissions("storehouse:warehousingInDetail:view")
-    @GetMapping()
-    public String warehousingInDetail()
-    {
-        return prefix + "/warehousingInDetail";
-    }
-
-    /**
-     * 查询入库物料列表
-     */
-    @RequiresPermissions("storehouse:warehousingInDetail:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(WarehousingInDetail warehousingInDetail)
-    {
-        startPage();
-        List<WarehousingInDetail> list = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出入库物料列表
-     */
-    @RequiresPermissions("storehouse:warehousingInDetail:export")
-    @Log(title = "入库物料", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(WarehousingInDetail warehousingInDetail)
-    {
-        List<WarehousingInDetail> list = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail);
-        ExcelUtil<WarehousingInDetail> util = new ExcelUtil<WarehousingInDetail>(WarehousingInDetail.class);
-        return util.exportExcel(list, "入库物料数据");
-    }
-
-    /**
-     * 新增入库物料
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存入库物料
-     */
-    @RequiresPermissions("storehouse:warehousingInDetail:add")
-    @Log(title = "入库物料", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(WarehousingInDetail warehousingInDetail)
-    {
-        return toAjax(warehousingInDetailService.insertWarehousingInDetail(warehousingInDetail));
-    }
-
-    /**
-     * 修改入库物料
-     */
-    @GetMapping("/edit/{warehousingDetailId}")
-    public String edit(@PathVariable("warehousingDetailId") Long warehousingDetailId, ModelMap mmap)
-    {
-        WarehousingInDetail warehousingInDetail = warehousingInDetailService.selectWarehousingInDetailById(warehousingDetailId);
-        mmap.put("warehousingInDetail", warehousingInDetail);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存入库物料
-     */
-    @RequiresPermissions("storehouse:warehousingInDetail:edit")
-    @Log(title = "入库物料", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(WarehousingInDetail warehousingInDetail)
-    {
-        return toAjax(warehousingInDetailService.updateWarehousingInDetail(warehousingInDetail));
-    }
-
-    /**
-     * 删除入库物料
-     */
-    @RequiresPermissions("storehouse:warehousingInDetail:remove")
-    @Log(title = "入库物料", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(warehousingInDetailService.deleteWarehousingInDetailByIds(ids));
-    }
-
-
-    @PostMapping("/addEditSave")
-    @ResponseBody
-    public AjaxResult addEditSave(@RequestParam(value = "data") String data)
-    {
-
-        //        反序列化
-        List<WarehousingInDetail> warehousingInDetailList = JSONObject.parseArray(data, WarehousingInDetail.class);
-
-
-        for (int i=0;i<warehousingInDetailList.size();i++) {
-
-            String id = String.valueOf(warehousingInDetailService.selectWarehousingInDetailById(warehousingInDetailList.get(i).getWarehousingDetailId()));
-            if (Objects.equals(id, "null")) {
-                warehousingInDetailService.insertWarehousingInDetail(warehousingInDetailList.get(i));
-            } else {
-                warehousingInDetailService.updateWarehousingInDetail(warehousingInDetailList.get(i));
-            }
-        }
-        return new AjaxResult(SUCCESS, "test done");
-    }
-
-    @PostMapping("/removeMaterial")
-    @ResponseBody
-    public AjaxResult removeMaterial(@RequestParam(value = "ids") String ids) {
-//        System.out.println(ids);
-        ids=ids.replace("[","").replace("]","");
-        List<String> idList = Arrays.asList(ids.split(","));
-        for (int i=0;i<idList.size();i++) {
-            if (!("null".equals(idList.get(i)))) {
-                warehousingInDetailService.deleteWarehousingInDetailById(Long.valueOf(idList.get(i)));
-            }
-        }
-        return new AjaxResult(SUCCESS, "test done");
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInDetail.java

@@ -1,230 +0,0 @@
-package com.ruoyi.storehouse.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 入库物料对象 warehousing_in_detail
- * 
- * @author ruoyi
- * @date 2023-04-27
- */
-public class WarehousingInDetail extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 入库物料id */
-    private Long warehousingDetailId;
-
-    /** 入库单号 */
-    @Excel(name = "入库单号")
-    private String warehousingNumber;
-
-    /** 物料代码 */
-    @Excel(name = "物料代码")
-    private String materialCode;
-
-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String materialName;
-
-    /** 物料类型 */
-    @Excel(name = "物料类型")
-    private String materialType;
-
-    /** 规格型号 */
-    @Excel(name = "规格型号")
-    private String specificationModel;
-
-    /** 机种 */
-    @Excel(name = "机种")
-    private String typeMachine;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String inventoryUnit;
-
-    /** 入库数量 */
-    @Excel(name = "入库数量")
-    private String warehousingQuantity;
-    /** 单价 */
-    @Excel(name = "单价")
-    private String unitPrice;
-    /** 金额 */
-    @Excel(name = "金额")
-    private String amountMoney;
-
-    /** 说明 */
-    @Excel(name = "说明")
-    private String description;
-
-    /** 批号 */
-    @Excel(name = "批号")
-    private String batchNumber;
-
-    /** 厂商批号 */
-    @Excel(name = "厂商批号")
-    private String manufacturerBatchNumber;
-
-    /** 存放地址 */
-    @Excel(name = "存放地址")
-    private String storageLocation;
-
-
-    public void setWarehousingDetailId(Long warehousingDetailId) 
-    {
-        this.warehousingDetailId = warehousingDetailId;
-    }
-
-    public Long getWarehousingDetailId() 
-    {
-        return warehousingDetailId;
-    }
-    public void setWarehousingNumber(String warehousingNumber) 
-    {
-        this.warehousingNumber = warehousingNumber;
-    }
-
-    public String getWarehousingNumber() 
-    {
-        return warehousingNumber;
-    }
-    public void setMaterialCode(String materialCode) 
-    {
-        this.materialCode = materialCode;
-    }
-
-    public String getMaterialCode() 
-    {
-        return materialCode;
-    }
-    public void setMaterialName(String materialName) 
-    {
-        this.materialName = materialName;
-    }
-
-    public String getMaterialName() 
-    {
-        return materialName;
-    }
-    public void setMaterialType(String materialType) 
-    {
-        this.materialType = materialType;
-    }
-
-    public String getMaterialType() 
-    {
-        return materialType;
-    }
-    public void setSpecificationModel(String specificationModel) 
-    {
-        this.specificationModel = specificationModel;
-    }
-
-    public String getSpecificationModel() 
-    {
-        return specificationModel;
-    }
-    public void setTypeMachine(String typeMachine) 
-    {
-        this.typeMachine = typeMachine;
-    }
-
-    public String getTypeMachine() 
-    {
-        return typeMachine;
-    }
-    public void setInventoryUnit(String inventoryUnit) 
-    {
-        this.inventoryUnit = inventoryUnit;
-    }
-
-    public String getInventoryUnit() 
-    {
-        return inventoryUnit;
-    }
-
-    public String getWarehousingQuantity() {
-        return warehousingQuantity;
-    }
-
-    public void setWarehousingQuantity(String warehousingQuantity) {
-        this.warehousingQuantity = warehousingQuantity;
-    }
-
-    public String getUnitPrice() {
-        return unitPrice;
-    }
-
-    public void setUnitPrice(String unitPrice) {
-        this.unitPrice = unitPrice;
-    }
-
-    public String getAmountMoney() {
-        return amountMoney;
-    }
-
-    public void setAmountMoney(String amountMoney) {
-        this.amountMoney = amountMoney;
-    }
-
-    public void setDescription(String description)
-    {
-        this.description = description;
-    }
-
-    public String getDescription() 
-    {
-        return description;
-    }
-    public void setBatchNumber(String batchNumber) 
-    {
-        this.batchNumber = batchNumber;
-    }
-
-    public String getBatchNumber() 
-    {
-        return batchNumber;
-    }
-    public void setManufacturerBatchNumber(String manufacturerBatchNumber) 
-    {
-        this.manufacturerBatchNumber = manufacturerBatchNumber;
-    }
-
-    public String getManufacturerBatchNumber() 
-    {
-        return manufacturerBatchNumber;
-    }
-    public void setStorageLocation(String storageLocation) 
-    {
-        this.storageLocation = storageLocation;
-    }
-
-    public String getStorageLocation() 
-    {
-        return storageLocation;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("warehousingDetailId", getWarehousingDetailId())
-            .append("warehousingNumber", getWarehousingNumber())
-            .append("materialCode", getMaterialCode())
-            .append("materialName", getMaterialName())
-            .append("materialType", getMaterialType())
-            .append("specificationModel", getSpecificationModel())
-            .append("typeMachine", getTypeMachine())
-            .append("inventoryUnit", getInventoryUnit())
-            .append("warehousingQuantity", getWarehousingQuantity())
-            .append("unitPrice", getUnitPrice())
-            .append("amountMoney", getAmountMoney())
-            .append("description", getDescription())
-            .append("batchNumber", getBatchNumber())
-            .append("manufacturerBatchNumber", getManufacturerBatchNumber())
-            .append("storageLocation", getStorageLocation())
-            .toString();
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInDetailMapper.java

@@ -1,62 +0,0 @@
-package com.ruoyi.storehouse.mapper;
-
-import com.ruoyi.storehouse.domain.WarehousingInDetail;
-
-import java.util.List;
-
-/**
- * 入库物料Mapper接口
- * 
- * @author ruoyi
- * @date 2023-04-27
- */
-public interface WarehousingInDetailMapper 
-{
-    /**
-     * 查询入库物料
-     * 
-     * @param warehousingDetailId 入库物料ID
-     * @return 入库物料
-     */
-    public WarehousingInDetail selectWarehousingInDetailById(Long warehousingDetailId);
-
-    /**
-     * 查询入库物料列表
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 入库物料集合
-     */
-    public List<WarehousingInDetail> selectWarehousingInDetailList(WarehousingInDetail warehousingInDetail);
-
-    /**
-     * 新增入库物料
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 结果
-     */
-    public int insertWarehousingInDetail(WarehousingInDetail warehousingInDetail);
-
-    /**
-     * 修改入库物料
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 结果
-     */
-    public int updateWarehousingInDetail(WarehousingInDetail warehousingInDetail);
-
-    /**
-     * 删除入库物料
-     * 
-     * @param warehousingDetailId 入库物料ID
-     * @return 结果
-     */
-    public int deleteWarehousingInDetailById(Long warehousingDetailId);
-
-    /**
-     * 批量删除入库物料
-     * 
-     * @param warehousingDetailIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteWarehousingInDetailByIds(String[] warehousingDetailIds);
-}

ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInDetailService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.storehouse.service;
-
-import java.util.List;
-import com.ruoyi.storehouse.domain.WarehousingInDetail;
-
-/**
- * 入库物料Service接口
- * 
- * @author ruoyi
- * @date 2023-04-27
- */
-public interface IWarehousingInDetailService 
-{
-    /**
-     * 查询入库物料
-     * 
-     * @param warehousingDetailId 入库物料ID
-     * @return 入库物料
-     */
-    public WarehousingInDetail selectWarehousingInDetailById(Long warehousingDetailId);
-
-    /**
-     * 查询入库物料列表
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 入库物料集合
-     */
-    public List<WarehousingInDetail> selectWarehousingInDetailList(WarehousingInDetail warehousingInDetail);
-
-    /**
-     * 新增入库物料
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 结果
-     */
-    public int insertWarehousingInDetail(WarehousingInDetail warehousingInDetail);
-
-    /**
-     * 修改入库物料
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 结果
-     */
-    public int updateWarehousingInDetail(WarehousingInDetail warehousingInDetail);
-
-    /**
-     * 批量删除入库物料
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteWarehousingInDetailByIds(String ids);
-
-    /**
-     * 删除入库物料信息
-     * 
-     * @param warehousingDetailId 入库物料ID
-     * @return 结果
-     */
-    public int deleteWarehousingInDetailById(Long warehousingDetailId);
-}

ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInDetailServiceImpl.java

@@ -1,95 +0,0 @@
-package com.ruoyi.storehouse.service.impl;
-
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.storehouse.domain.WarehousingInDetail;
-import com.ruoyi.storehouse.mapper.WarehousingInDetailMapper;
-import com.ruoyi.storehouse.service.IWarehousingInDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 入库物料Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-04-27
- */
-@Service
-public class WarehousingInDetailServiceImpl implements IWarehousingInDetailService 
-{
-    @Autowired
-    private WarehousingInDetailMapper warehousingInDetailMapper;
-
-    /**
-     * 查询入库物料
-     * 
-     * @param warehousingDetailId 入库物料ID
-     * @return 入库物料
-     */
-    @Override
-    public WarehousingInDetail selectWarehousingInDetailById(Long warehousingDetailId)
-    {
-        return warehousingInDetailMapper.selectWarehousingInDetailById(warehousingDetailId);
-    }
-
-    /**
-     * 查询入库物料列表
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 入库物料
-     */
-    @Override
-    public List<WarehousingInDetail> selectWarehousingInDetailList(WarehousingInDetail warehousingInDetail)
-    {
-        return warehousingInDetailMapper.selectWarehousingInDetailList(warehousingInDetail);
-    }
-
-    /**
-     * 新增入库物料
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 结果
-     */
-    @Override
-    public int insertWarehousingInDetail(WarehousingInDetail warehousingInDetail)
-    {
-        return warehousingInDetailMapper.insertWarehousingInDetail(warehousingInDetail);
-    }
-
-    /**
-     * 修改入库物料
-     * 
-     * @param warehousingInDetail 入库物料
-     * @return 结果
-     */
-    @Override
-    public int updateWarehousingInDetail(WarehousingInDetail warehousingInDetail)
-    {
-        return warehousingInDetailMapper.updateWarehousingInDetail(warehousingInDetail);
-    }
-
-    /**
-     * 删除入库物料对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteWarehousingInDetailByIds(String ids)
-    {
-        return warehousingInDetailMapper.deleteWarehousingInDetailByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除入库物料信息
-     * 
-     * @param warehousingDetailId 入库物料ID
-     * @return 结果
-     */
-    @Override
-    public int deleteWarehousingInDetailById(Long warehousingDetailId)
-    {
-        return warehousingInDetailMapper.deleteWarehousingInDetailById(warehousingDetailId);
-    }
-}

ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInDetailMapper.xml

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.storehouse.mapper.WarehousingInDetailMapper">
-    
-    <resultMap type="WarehousingInDetail" id="WarehousingInDetailResult">
-        <result property="warehousingDetailId"    column="warehousing_detail_id"    />
-        <result property="warehousingNumber"    column="warehousing_number"    />
-        <result property="materialCode"    column="material_code"    />
-        <result property="materialName"    column="material_name"    />
-        <result property="materialType"    column="material_type"    />
-        <result property="specificationModel"    column="specification_model"    />
-        <result property="typeMachine"    column="type_machine"    />
-        <result property="inventoryUnit"    column="inventory_unit"    />
-        <result property="warehousingQuantity"    column="warehousing_quantity"    />
-        <result property="unitPrice"    column="unit_price"    />
-        <result property="amountMoney"    column="amount_money"    />
-        <result property="description"    column="description"    />
-        <result property="batchNumber"    column="batch_number"    />
-        <result property="manufacturerBatchNumber"    column="manufacturer_batch_number"    />
-        <result property="storageLocation"    column="storage_location"    />
-    </resultMap>
-
-    <sql id="selectWarehousingInDetailVo">
-        select warehousing_detail_id, warehousing_number, material_code, material_name, material_type, specification_model, type_machine, inventory_unit, warehousing_quantity, unit_price, amount_money, description, batch_number, manufacturer_batch_number, storage_location from warehousing_in_detail
-    </sql>
-
-    <select id="selectWarehousingInDetailList" parameterType="WarehousingInDetail" resultMap="WarehousingInDetailResult">
-        <include refid="selectWarehousingInDetailVo"/>
-        <where>  
-            <if test="warehousingNumber != null  and warehousingNumber != ''"> and warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
-            <if test="materialCode != null  and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
-            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
-            <if test="materialType != null  and materialType != ''"> and material_type = #{materialType}</if>
-        </where>
-    </select>
-    
-    <select id="selectWarehousingInDetailById" parameterType="Long" resultMap="WarehousingInDetailResult">
-        <include refid="selectWarehousingInDetailVo"/>
-        where warehousing_detail_id = #{warehousingDetailId}
-    </select>
-        
-    <insert id="insertWarehousingInDetail" parameterType="WarehousingInDetail" useGeneratedKeys="true" keyProperty="warehousingDetailId">
-        insert into warehousing_in_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="warehousingNumber != null">warehousing_number,</if>
-            <if test="materialCode != null">material_code,</if>
-            <if test="materialName != null">material_name,</if>
-            <if test="materialType != null">material_type,</if>
-            <if test="specificationModel != null">specification_model,</if>
-            <if test="typeMachine != null">type_machine,</if>
-            <if test="inventoryUnit != null">inventory_unit,</if>
-            <if test="warehousingQuantity != null">warehousing_quantity,</if>
-            <if test="unitPrice != null">unit_price,</if>
-            <if test="amountMoney != null">amount_money,</if>
-            <if test="description != null">description,</if>
-            <if test="batchNumber != null">batch_number,</if>
-            <if test="manufacturerBatchNumber != null">manufacturer_batch_number,</if>
-            <if test="storageLocation != null">storage_location,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="warehousingNumber != null">#{warehousingNumber},</if>
-            <if test="materialCode != null">#{materialCode},</if>
-            <if test="materialName != null">#{materialName},</if>
-            <if test="materialType != null">#{materialType},</if>
-            <if test="specificationModel != null">#{specificationModel},</if>
-            <if test="typeMachine != null">#{typeMachine},</if>
-            <if test="inventoryUnit != null">#{inventoryUnit},</if>
-            <if test="warehousingQuantity != null">#{warehousingQuantity},</if>
-            <if test="unitPrice != null">#{unitPrice},</if>
-            <if test="amountMoney != null">#{amountMoney},</if>
-            <if test="description != null">#{description},</if>
-            <if test="batchNumber != null">#{batchNumber},</if>
-            <if test="manufacturerBatchNumber != null">#{manufacturerBatchNumber},</if>
-            <if test="storageLocation != null">#{storageLocation},</if>
-         </trim>
-    </insert>
-
-    <update id="updateWarehousingInDetail" parameterType="WarehousingInDetail">
-        update warehousing_in_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="warehousingNumber != null">warehousing_number = #{warehousingNumber},</if>
-            <if test="materialCode != null">material_code = #{materialCode},</if>
-            <if test="materialName != null">material_name = #{materialName},</if>
-            <if test="materialType != null">material_type = #{materialType},</if>
-            <if test="specificationModel != null">specification_model = #{specificationModel},</if>
-            <if test="typeMachine != null">type_machine = #{typeMachine},</if>
-            <if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
-            <if test="warehousingQuantity != null">warehousing_quantity = #{warehousingQuantity},</if>
-            <if test="unitPrice != null">unit_price = #{unitPrice},</if>
-            <if test="amountMoney != null">amount_money = #{amountMoney},</if>
-            <if test="description != null">description = #{description},</if>
-            <if test="batchNumber != null">batch_number = #{batchNumber},</if>
-            <if test="manufacturerBatchNumber != null">manufacturer_batch_number = #{manufacturerBatchNumber},</if>
-            <if test="storageLocation != null">storage_location = #{storageLocation},</if>
-        </trim>
-        where warehousing_detail_id = #{warehousingDetailId}
-    </update>
-
-    <delete id="deleteWarehousingInDetailById" parameterType="Long">
-        delete from warehousing_in_detail where warehousing_detail_id = #{warehousingDetailId}
-    </delete>
-
-    <delete id="deleteWarehousingInDetailByIds" parameterType="String">
-        delete from warehousing_in_detail where warehousing_detail_id in 
-        <foreach item="warehousingDetailId" collection="array" open="(" separator="," close=")">
-            #{warehousingDetailId}
-        </foreach>
-    </delete>
-
-</mapper>

ruoyi-admin/src/main/resources/templates/storehouse/warehousingInDetail/add.html

@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增入库物料')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-warehousingInDetail-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">入库单号：</label>
-                <div class="col-sm-8">
-                    <input name="warehousingNumber" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">物料代码：</label>
-                <div class="col-sm-8">
-                    <input name="materialCode" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">物料名称：</label>
-                <div class="col-sm-8">
-                    <input name="materialName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">物料类型：</label>
-                <div class="col-sm-8">
-                    <select name="materialType" class="form-control m-b" th:with="type=${@dict.getType('ck_meterialt_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">规格型号：</label>
-                <div class="col-sm-8">
-                    <input name="specificationModel" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">机种：</label>
-                <div class="col-sm-8">
-                    <input name="typeMachine" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">单位：</label>
-                <div class="col-sm-8">
-                    <input name="inventoryUnit" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">合格数量：</label>
-                <div class="col-sm-8">
-                    <input name="qualifiedQuantity" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">说明：</label>
-                <div class="col-sm-8">
-                    <textarea name="description" class="form-control"></textarea>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">批号：</label>
-                <div class="col-sm-8">
-                    <input name="batchNumber" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">厂商批号：</label>
-                <div class="col-sm-8">
-                    <input name="manufacturerBatchNumber" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">存放地址：</label>
-                <div class="col-sm-8">
-                    <input name="storageLocation" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">退货数量：</label>
-                <div class="col-sm-8">
-                    <input name="returnGoodsQuantity" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "storehouse/warehousingInDetail"
-        $("#form-warehousingInDetail-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-warehousingInDetail-add').serialize());
-            }
-        }
-    </script>
-</body>
-</html>

ruoyi-admin/src/main/resources/templates/storehouse/warehousingInDetail/edit.html

@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改入库物料')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-warehousingInDetail-edit" th:object="${warehousingInDetail}">
-            <input name="warehousingDetailId" th:field="*{warehousingDetailId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">入库单号：</label>
-                <div class="col-sm-8">
-                    <input name="warehousingNumber" th:field="*{warehousingNumber}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">物料代码：</label>
-                <div class="col-sm-8">
-                    <input name="materialCode" th:field="*{materialCode}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">物料名称：</label>
-                <div class="col-sm-8">
-                    <input name="materialName" th:field="*{materialName}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">物料类型：</label>
-                <div class="col-sm-8">
-                    <select name="materialType" class="form-control m-b" th:with="type=${@dict.getType('ck_meterialt_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{materialType}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">规格型号：</label>
-                <div class="col-sm-8">
-                    <input name="specificationModel" th:field="*{specificationModel}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">机种：</label>
-                <div class="col-sm-8">
-                    <input name="typeMachine" th:field="*{typeMachine}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">单位：</label>
-                <div class="col-sm-8">
-                    <input name="inventoryUnit" th:field="*{inventoryUnit}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">合格数量：</label>
-                <div class="col-sm-8">
-                    <input name="qualifiedQuantity" th:field="*{qualifiedQuantity}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">说明：</label>
-                <div class="col-sm-8">
-                    <textarea name="description" class="form-control">[[*{description}]]</textarea>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">批号：</label>
-                <div class="col-sm-8">
-                    <input name="batchNumber" th:field="*{batchNumber}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">厂商批号：</label>
-                <div class="col-sm-8">
-                    <input name="manufacturerBatchNumber" th:field="*{manufacturerBatchNumber}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">存放地址：</label>
-                <div class="col-sm-8">
-                    <input name="storageLocation" th:field="*{storageLocation}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">退货数量：</label>
-                <div class="col-sm-8">
-                    <input name="returnGoodsQuantity" th:field="*{returnGoodsQuantity}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "storehouse/warehousingInDetail";
-        $("#form-warehousingInDetail-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-warehousingInDetail-edit').serialize());
-            }
-        }
-    </script>
-</body>
-</html>

ruoyi-admin/src/main/resources/templates/storehouse/warehousingInDetail/warehousingInDetail.html

@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('入库物料列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>入库单号：</label>
-                                <input type="text" name="warehousingNumber"/>
-                            </li>
-                            <li>
-                                <label>物料代码：</label>
-                                <input type="text" name="materialCode"/>
-                            </li>
-                            <li>
-                                <label>物料名称：</label>
-                                <input type="text" name="materialName"/>
-                            </li>
-                            <li>
-                                <label>物料类型：</label>
-                                <select name="materialType" th:with="type=${@dict.getType('ck_meterialt_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="storehouse:warehousingInDetail:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:warehousingInDetail:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:warehousingInDetail:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:warehousingInDetail:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('storehouse:warehousingInDetail:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('storehouse:warehousingInDetail:remove')}]];
-        var materialTypeDatas = [[${@dict.getType('ck_meterialt_type')}]];
-        var prefix = ctx + "storehouse/warehousingInDetail";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "入库物料",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'warehousingDetailId',
-                    title: '入库物料id',
-                    visible: false
-                },
-                {
-                    field: 'warehousingNumber',
-                    title: '入库单号'
-                },
-                {
-                    field: 'materialCode',
-                    title: '物料代码'
-                },
-                {
-                    field: 'materialName',
-                    title: '物料名称'
-                },
-                {
-                    field: 'materialType',
-                    title: '物料类型',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(materialTypeDatas, value);
-                    }
-                },
-                {
-                    field: 'specificationModel',
-                    title: '规格型号'
-                },
-                {
-                    field: 'typeMachine',
-                    title: '机种'
-                },
-                {
-                    field: 'inventoryUnit',
-                    title: '单位'
-                },
-                {
-                    field: 'qualifiedQuantity',
-                    title: '合格数量'
-                },
-                {
-                    field: 'description',
-                    title: '说明'
-                },
-                {
-                    field: 'batchNumber',
-                    title: '批号'
-                },
-                {
-                    field: 'manufacturerBatchNumber',
-                    title: '厂商批号'
-                },
-                {
-                    field: 'storageLocation',
-                    title: '存放地址'
-                },
-                {
-                    field: 'returnGoodsQuantity',
-                    title: '退货数量'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.warehousingDetailId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.warehousingDetailId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>