root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[delete] 

删除旧版无用的领料单对象 material_requisition_list和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据
dev
liuxiaoxu 1 month ago
parent
f696cc81aa
commit
a8d33d894d
9 changed files with 0 additions and 1375 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 123
      ruoyi-admin/src/main/java/com/ruoyi/produce/controller/MaterialRequisitionListController.java
  2. 307
      ruoyi-admin/src/main/java/com/ruoyi/produce/domain/MaterialRequisitionList.java
  3. 62
      ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/MaterialRequisitionListMapper.java
  4. 62
      ruoyi-admin/src/main/java/com/ruoyi/produce/service/IMaterialRequisitionListService.java
  5. 95
      ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/MaterialRequisitionListServiceImpl.java
  6. 155
      ruoyi-admin/src/main/resources/mapper/produce/MaterialRequisitionListMapper.xml
  7. 160
      ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/add.html
  8. 161
      ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/edit.html
  9. 250
      ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/materialRequisitionList.html

123
ruoyi-admin/src/main/java/com/ruoyi/produce/controller/MaterialRequisitionListController.java
View File

@ -1,123 +0,0 @@
package com.ruoyi.produce.controller;
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.produce.domain.MaterialRequisitionList;
import com.ruoyi.produce.service.IMaterialRequisitionListService;
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.List;
/**
* 领料单Controller
*
* @author ruoyi
* @date 2022-01-06
*/
@Controller
@RequestMapping("/produce/materialRequisitionList")
public class MaterialRequisitionListController extends BaseController
{
private String prefix = "produce/materialRequisitionList";
@Autowired
private IMaterialRequisitionListService materialRequisitionListService;
@RequiresPermissions("produce:materialRequisitionList:view")
@GetMapping()
public String materialRequisitionList()
{
return prefix + "/materialRequisitionList";
}
/**
* 查询领料单列表
*/
@RequiresPermissions("produce:materialRequisitionList:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(MaterialRequisitionList materialRequisitionList)
{
startPage();
List<MaterialRequisitionList> list = materialRequisitionListService.selectMaterialRequisitionListList(materialRequisitionList);
return getDataTable(list);
}
/**
* 导出领料单列表
*/
@RequiresPermissions("produce:materialRequisitionList:export")
@Log(title = "领料单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(MaterialRequisitionList materialRequisitionList)
{
List<MaterialRequisitionList> list = materialRequisitionListService.selectMaterialRequisitionListList(materialRequisitionList);
ExcelUtil<MaterialRequisitionList> util = new ExcelUtil<MaterialRequisitionList>(MaterialRequisitionList.class);
return util.exportExcel(list, "领料单数据");
}
/**
* 新增领料单
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存领料单
*/
@RequiresPermissions("produce:materialRequisitionList:add")
@Log(title = "领料单", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(MaterialRequisitionList materialRequisitionList)
{
return toAjax(materialRequisitionListService.insertMaterialRequisitionList(materialRequisitionList));
}
/**
* 修改领料单
*/
@GetMapping("/edit/{materialRequisitionNo}")
public String edit(@PathVariable("materialRequisitionNo") String materialRequisitionNo, ModelMap mmap)
{
MaterialRequisitionList materialRequisitionList = materialRequisitionListService.selectMaterialRequisitionListById(materialRequisitionNo);
mmap.put("materialRequisitionList", materialRequisitionList);
return prefix + "/edit";
}
/**
* 修改保存领料单
*/
@RequiresPermissions("produce:materialRequisitionList:edit")
@Log(title = "领料单", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(MaterialRequisitionList materialRequisitionList)
{
return toAjax(materialRequisitionListService.updateMaterialRequisitionList(materialRequisitionList));
}
/**
* 删除领料单
*/
@RequiresPermissions("produce:materialRequisitionList:remove")
@Log(title = "领料单", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(materialRequisitionListService.deleteMaterialRequisitionListByIds(ids));
}
}

307
ruoyi-admin/src/main/java/com/ruoyi/produce/domain/MaterialRequisitionList.java
View File

@ -1,307 +0,0 @@
package com.ruoyi.produce.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
/**
* 领料单对象 material_requisition_list
*
* @author ruoyi
* @date 2022-01-06
*/
public class MaterialRequisitionList extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 领料单号 */
@Excel(name = "领料单号")
private String materialRequisitionNo;
/** 批号 */
@Excel(name = "批号")
private String batchNum;
/** 物料代码 */
@Excel(name = "物料代码")
private String itemCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String itemName;
/** 规格型号 */
@Excel(name = "规格型号")
private String itemSpecification;
/** 机种 */
@Excel(name = "机种")
private String machineType;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 计划数量 */
@Excel(name = "计划数量")
private Long planQty;
/** 数量 */
@Excel(name = "数量")
private Long qty;
/** 退回数量 */
@Excel(name = "退回数量")
private Long returnQty;
/** 币别 */
@Excel(name = "币别")
private String coinType;
/** 单价 */
@Excel(name = "单价")
private BigDecimal price;
/** 总价 */
@Excel(name = "总价")
private BigDecimal totalPrice;
/** 存放位置 */
@Excel(name = "存放位置")
private String depositPosition;
/** 物料种类 */
@Excel(name = "物料种类")
private String spare1;
/** */
@Excel(name = "")
private String spare2;
/** */
@Excel(name = "")
private String spare3;
/** */
@Excel(name = "")
private String spare4;
/** */
@Excel(name = "")
private String spare5;
/** */
@Excel(name = "")
private String spare6;
public void setMaterialRequisitionNo(String materialRequisitionNo)
{
this.materialRequisitionNo = materialRequisitionNo;
}
public String getMaterialRequisitionNo()
{
return materialRequisitionNo;
}
public void setBatchNum(String batchNum)
{
this.batchNum = batchNum;
}
public String getBatchNum()
{
return batchNum;
}
public void setItemCode(String itemCode)
{
this.itemCode = itemCode;
}
public String getItemCode()
{
return itemCode;
}
public void setItemName(String itemName)
{
this.itemName = itemName;
}
public String getItemName()
{
return itemName;
}
public void setItemSpecification(String itemSpecification)
{
this.itemSpecification = itemSpecification;
}
public String getItemSpecification()
{
return itemSpecification;
}
public void setMachineType(String machineType)
{
this.machineType = machineType;
}
public String getMachineType()
{
return machineType;
}
public void setUnit(String unit)
{
this.unit = unit;
}
public String getUnit()
{
return unit;
}
public void setPlanQty(Long planQty)
{
this.planQty = planQty;
}
public Long getPlanQty()
{
return planQty;
}
public void setQty(Long qty)
{
this.qty = qty;
}
public Long getQty()
{
return qty;
}
public void setReturnQty(Long returnQty)
{
this.returnQty = returnQty;
}
public Long getReturnQty()
{
return returnQty;
}
public void setCoinType(String coinType)
{
this.coinType = coinType;
}
public String getCoinType()
{
return coinType;
}
public void setPrice(BigDecimal price)
{
this.price = price;
}
public BigDecimal getPrice()
{
return price;
}
public void setTotalPrice(BigDecimal totalPrice)
{
this.totalPrice = totalPrice;
}
public BigDecimal getTotalPrice()
{
return totalPrice;
}
public void setDepositPosition(String depositPosition)
{
this.depositPosition = depositPosition;
}
public String getDepositPosition()
{
return depositPosition;
}
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
{
return spare2;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
{
return spare3;
}
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
{
return spare4;
}
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare5()
{
return spare5;
}
public void setSpare6(String spare6)
{
this.spare6 = spare6;
}
public String getSpare6()
{
return spare6;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("materialRequisitionNo", getMaterialRequisitionNo())
.append("batchNum", getBatchNum())
.append("itemCode", getItemCode())
.append("itemName", getItemName())
.append("itemSpecification", getItemSpecification())
.append("machineType", getMachineType())
.append("unit", getUnit())
.append("planQty", getPlanQty())
.append("qty", getQty())
.append("returnQty", getReturnQty())
.append("coinType", getCoinType())
.append("price", getPrice())
.append("totalPrice", getTotalPrice())
.append("depositPosition", getDepositPosition())
.append("remark", getRemark())
.append("spare1", getSpare1())
.append("spare2", getSpare2())
.append("spare3", getSpare3())
.append("spare4", getSpare4())
.append("spare5", getSpare5())
.append("spare6", getSpare6())
.toString();
}
}

62
ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/MaterialRequisitionListMapper.java
View File

@ -1,62 +0,0 @@
package com.ruoyi.produce.mapper;
import com.ruoyi.produce.domain.MaterialRequisitionList;
import java.util.List;
/**
* 领料单Mapper接口
*
* @author ruoyi
* @date 2022-01-06
*/
public interface MaterialRequisitionListMapper
{
/**
* 查询领料单
*
* @param materialRequisitionNo 领料单ID
* @return 领料单
*/
public MaterialRequisitionList selectMaterialRequisitionListById(String materialRequisitionNo);
/**
* 查询领料单列表
*
* @param materialRequisitionList 领料单
* @return 领料单集合
*/
public List<MaterialRequisitionList> selectMaterialRequisitionListList(MaterialRequisitionList materialRequisitionList);
/**
* 新增领料单
*
* @param materialRequisitionList 领料单
* @return 结果
*/
public int insertMaterialRequisitionList(MaterialRequisitionList materialRequisitionList);
/**
* 修改领料单
*
* @param materialRequisitionList 领料单
* @return 结果
*/
public int updateMaterialRequisitionList(MaterialRequisitionList materialRequisitionList);
/**
* 删除领料单
*
* @param materialRequisitionNo 领料单ID
* @return 结果
*/
public int deleteMaterialRequisitionListById(String materialRequisitionNo);
/**
* 批量删除领料单
*
* @param materialRequisitionNos 需要删除的数据ID
* @return 结果
*/
public int deleteMaterialRequisitionListByIds(String[] materialRequisitionNos);
}

62
ruoyi-admin/src/main/java/com/ruoyi/produce/service/IMaterialRequisitionListService.java
View File

@ -1,62 +0,0 @@
package com.ruoyi.produce.service;
import com.ruoyi.produce.domain.MaterialRequisitionList;
import java.util.List;
/**
* 领料单Service接口
*
* @author ruoyi
* @date 2022-01-06
*/
public interface IMaterialRequisitionListService
{
/**
* 查询领料单
*
* @param materialRequisitionNo 领料单ID
* @return 领料单
*/
public MaterialRequisitionList selectMaterialRequisitionListById(String materialRequisitionNo);
/**
* 查询领料单列表
*
* @param materialRequisitionList 领料单
* @return 领料单集合
*/
public List<MaterialRequisitionList> selectMaterialRequisitionListList(MaterialRequisitionList materialRequisitionList);
/**
* 新增领料单
*
* @param materialRequisitionList 领料单
* @return 结果
*/
public int insertMaterialRequisitionList(MaterialRequisitionList materialRequisitionList);
/**
* 修改领料单
*
* @param materialRequisitionList 领料单
* @return 结果
*/
public int updateMaterialRequisitionList(MaterialRequisitionList materialRequisitionList);
/**
* 批量删除领料单
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteMaterialRequisitionListByIds(String ids);
/**
* 删除领料单信息
*
* @param materialRequisitionNo 领料单ID
* @return 结果
*/
public int deleteMaterialRequisitionListById(String materialRequisitionNo);
}

95
ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/MaterialRequisitionListServiceImpl.java
View File

@ -1,95 +0,0 @@
package com.ruoyi.produce.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.produce.domain.MaterialRequisitionList;
import com.ruoyi.produce.mapper.MaterialRequisitionListMapper;
import com.ruoyi.produce.service.IMaterialRequisitionListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 领料单Service业务层处理
*
* @author ruoyi
* @date 2022-01-06
*/
@Service
public class MaterialRequisitionListServiceImpl implements IMaterialRequisitionListService
{
@Autowired
private MaterialRequisitionListMapper materialRequisitionListMapper;
/**
* 查询领料单
*
* @param materialRequisitionNo 领料单ID
* @return 领料单
*/
@Override
public MaterialRequisitionList selectMaterialRequisitionListById(String materialRequisitionNo)
{
return materialRequisitionListMapper.selectMaterialRequisitionListById(materialRequisitionNo);
}
/**
* 查询领料单列表
*
* @param materialRequisitionList 领料单
* @return 领料单
*/
@Override
public List<MaterialRequisitionList> selectMaterialRequisitionListList(MaterialRequisitionList materialRequisitionList)
{
return materialRequisitionListMapper.selectMaterialRequisitionListList(materialRequisitionList);
}
/**
* 新增领料单
*
* @param materialRequisitionList 领料单
* @return 结果
*/
@Override
public int insertMaterialRequisitionList(MaterialRequisitionList materialRequisitionList)
{
return materialRequisitionListMapper.insertMaterialRequisitionList(materialRequisitionList);
}
/**
* 修改领料单
*
* @param materialRequisitionList 领料单
* @return 结果
*/
@Override
public int updateMaterialRequisitionList(MaterialRequisitionList materialRequisitionList)
{
return materialRequisitionListMapper.updateMaterialRequisitionList(materialRequisitionList);
}
/**
* 删除领料单对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteMaterialRequisitionListByIds(String ids)
{
return materialRequisitionListMapper.deleteMaterialRequisitionListByIds(Convert.toStrArray(ids));
}
/**
* 删除领料单信息
*
* @param materialRequisitionNo 领料单ID
* @return 结果
*/
@Override
public int deleteMaterialRequisitionListById(String materialRequisitionNo)
{
return materialRequisitionListMapper.deleteMaterialRequisitionListById(materialRequisitionNo);
}
}

155
ruoyi-admin/src/main/resources/mapper/produce/MaterialRequisitionListMapper.xml
View File

@ -1,155 +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.produce.mapper.MaterialRequisitionListMapper">
<resultMap type="MaterialRequisitionList" id="MaterialRequisitionListResult">
<result property="materialRequisitionNo" column="materialRequisitionNo" />
<result property="batchNum" column="batchNum" />
<result property="itemCode" column="itemCode" />
<result property="itemName" column="itemName" />
<result property="itemSpecification" column="itemSpecification" />
<result property="machineType" column="machineType" />
<result property="unit" column="unit" />
<result property="planQty" column="planQty" />
<result property="qty" column="qty" />
<result property="returnQty" column="returnQty" />
<result property="coinType" column="coinType" />
<result property="price" column="price" />
<result property="totalPrice" column="totalPrice" />
<result property="depositPosition" column="depositPosition" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
</resultMap>
<sql id="selectMaterialRequisitionListVo">
select materialRequisitionNo, batchNum, itemCode, itemName, itemSpecification, machineType, unit, planQty, qty, returnQty, coinType, price, totalPrice, depositPosition, remark, spare1, spare2, spare3, spare4, spare5, spare6 from material_requisition_list
</sql>
<select id="selectMaterialRequisitionListList" parameterType="MaterialRequisitionList" resultMap="MaterialRequisitionListResult">
<include refid="selectMaterialRequisitionListVo"/>
<where>
<if test="materialRequisitionNo != null and materialRequisitionNo != ''"> and materialRequisitionNo like concat('%', #{materialRequisitionNo}, '%')</if>
<if test="batchNum != null and batchNum != ''"> and batchNum like concat('%', #{batchNum}, '%')</if>
<if test="itemCode != null and itemCode != ''"> and itemCode like concat('%', #{itemCode}, '%')</if>
<if test="itemName != null and itemName != ''"> and itemName like concat('%', #{itemName}, '%')</if>
<if test="itemSpecification != null and itemSpecification != ''"> and itemSpecification like concat('%', #{itemSpecification}, '%')</if>
<if test="machineType != null and machineType != ''"> and machineType like concat('%', #{machineType}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="planQty != null "> and planQty = #{planQty}</if>
<if test="qty != null "> and qty = #{qty}</if>
<if test="returnQty != null "> and returnQty = #{returnQty}</if>
<if test="coinType != null and coinType != ''"> and coinType = #{coinType}</if>
<if test="price != null "> and price like concat('%', #{price}, '%')</if>
<if test="totalPrice != null "> and totalPrice like concat('%', #{totalPrice}, '%')</if>
<if test="depositPosition != null and depositPosition != ''"> and depositPosition like concat('%', #{depositPosition}, '%')</if>
<if test="remark != null and remark != ''"> and remark = #{remark}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<select id="selectMaterialRequisitionListById" parameterType="String" resultMap="MaterialRequisitionListResult">
<include refid="selectMaterialRequisitionListVo"/>
where materialRequisitionNo = #{materialRequisitionNo}
</select>
<insert id="insertMaterialRequisitionList" parameterType="MaterialRequisitionList">
insert into material_requisition_list
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="materialRequisitionNo != null and materialRequisitionNo != ''">materialRequisitionNo,</if>
<if test="batchNum != null">batchNum,</if>
<if test="itemCode != null">itemCode,</if>
<if test="itemName != null">itemName,</if>
<if test="itemSpecification != null">itemSpecification,</if>
<if test="machineType != null">machineType,</if>
<if test="unit != null">unit,</if>
<if test="planQty != null">planQty,</if>
<if test="qty != null">qty,</if>
<if test="returnQty != null">returnQty,</if>
<if test="coinType != null">coinType,</if>
<if test="price != null">price,</if>
<if test="totalPrice != null">totalPrice,</if>
<if test="depositPosition != null">depositPosition,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="materialRequisitionNo != null and materialRequisitionNo != ''">#{materialRequisitionNo},</if>
<if test="batchNum != null">#{batchNum},</if>
<if test="itemCode != null">#{itemCode},</if>
<if test="itemName != null">#{itemName},</if>
<if test="itemSpecification != null">#{itemSpecification},</if>
<if test="machineType != null">#{machineType},</if>
<if test="unit != null">#{unit},</if>
<if test="planQty != null">#{planQty},</if>
<if test="qty != null">#{qty},</if>
<if test="returnQty != null">#{returnQty},</if>
<if test="coinType != null">#{coinType},</if>
<if test="price != null">#{price},</if>
<if test="totalPrice != null">#{totalPrice},</if>
<if test="depositPosition != null">#{depositPosition},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
</trim>
</insert>
<update id="updateMaterialRequisitionList" parameterType="MaterialRequisitionList">
update material_requisition_list
<trim prefix="SET" suffixOverrides=",">
<if test="batchNum != null">batchNum = #{batchNum},</if>
<if test="itemCode != null">itemCode = #{itemCode},</if>
<if test="itemName != null">itemName = #{itemName},</if>
<if test="itemSpecification != null">itemSpecification = #{itemSpecification},</if>
<if test="machineType != null">machineType = #{machineType},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="planQty != null">planQty = #{planQty},</if>
<if test="qty != null">qty = #{qty},</if>
<if test="returnQty != null">returnQty = #{returnQty},</if>
<if test="coinType != null">coinType = #{coinType},</if>
<if test="price != null">price = #{price},</if>
<if test="totalPrice != null">totalPrice = #{totalPrice},</if>
<if test="depositPosition != null">depositPosition = #{depositPosition},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
</trim>
where materialRequisitionNo = #{materialRequisitionNo}
</update>
<delete id="deleteMaterialRequisitionListById" parameterType="String">
delete from material_requisition_list where materialRequisitionNo = #{materialRequisitionNo}
</delete>
<delete id="deleteMaterialRequisitionListByIds" parameterType="String">
delete from material_requisition_list where materialRequisitionNo in
<foreach item="materialRequisitionNo" collection="array" open="(" separator="," close=")">
#{materialRequisitionNo}
</foreach>
</delete>
</mapper>

160
ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/add.html
View File

@ -1,160 +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-materialRequisitionList-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">领料单号：</label>
<div class="col-sm-8">
<input name="materialRequisitionNo" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">批号：</label>
<div class="col-sm-8">
<input name="batchNum" 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="itemCode" 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="itemName" 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="itemSpecification" 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="machineType" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位：</label>
<div class="col-sm-8">
<input name="unit" 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="planQty" 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="qty" 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="returnQty" 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="coinType" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单价：</label>
<div class="col-sm-8">
<input name="price" 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="totalPrice" 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="depositPosition" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="remark" 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="spare1" 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="spare2" 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="spare3" 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="spare4" 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="spare5" 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="spare6" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "produce/materialRequisitionList"
$("#form-materialRequisitionList-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-materialRequisitionList-add').serialize());
}
}
</script>
</body>
</html>

161
ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/edit.html
View File

@ -1,161 +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-materialRequisitionList-edit" th:object="${materialRequisitionList}">
<input name="materialRequisitionNo" th:field="*{materialRequisitionNo}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">领料单号：</label>
<div class="col-sm-8">
<input name="materialRequisitionNo" th:field="*{materialRequisitionNo}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">批号：</label>
<div class="col-sm-8">
<input name="batchNum" th:field="*{batchNum}" 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="itemCode" th:field="*{itemCode}" 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="itemName" th:field="*{itemName}" 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="itemSpecification" th:field="*{itemSpecification}" 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="machineType" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位：</label>
<div class="col-sm-8">
<input name="unit" th:field="*{unit}" 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="planQty" th:field="*{planQty}" 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="qty" th:field="*{qty}" 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="returnQty" th:field="*{returnQty}" 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="coinType" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单价：</label>
<div class="col-sm-8">
<input name="price" th:field="*{price}" 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="totalPrice" th:field="*{totalPrice}" 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="depositPosition" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="remark" th:field="*{remark}" 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="spare1" th:field="*{spare1}" 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="spare2" th:field="*{spare2}" 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="spare3" th:field="*{spare3}" 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="spare4" th:field="*{spare4}" 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="spare5" th:field="*{spare5}" 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="spare6" th:field="*{spare6}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "produce/materialRequisitionList";
$("#form-materialRequisitionList-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-materialRequisitionList-edit').serialize());
}
}
</script>
</body>
</html>

250
ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/materialRequisitionList.html
View File

@ -1,250 +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="materialRequisitionNo"/>
</li>
<li>
<label>批号：</label>
<input type="text" name="batchNum"/>
</li>
<li>
<label>物料代码：</label>
<input type="text" name="itemCode"/>
</li>
<li>
<label>物料名称：</label>
<input type="text" name="itemName"/>
</li>
<li>
<label>规格型号：</label>
<input type="text" name="itemSpecification"/>
</li>
<li>
<label>机种：</label>
<select name="machineType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>单位：</label>
<input type="text" name="unit"/>
</li>
<li>
<label>计划数量：</label>
<input type="text" name="planQty"/>
</li>
<li>
<label>数量：</label>
<input type="text" name="qty"/>
</li>
<li>
<label>退回数量：</label>
<input type="text" name="returnQty"/>
</li>
<li>
<label>币别：</label>
<select name="coinType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>单价：</label>
<input type="text" name="price"/>
</li>
<li>
<label>总价：</label>
<input type="text" name="totalPrice"/>
</li>
<li>
<label>存放位置：</label>
<select name="depositPosition">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>备注：</label>
<input type="text" name="remark"/>
</li>
<li>
<label>：</label>
<input type="text" name="spare1"/>
</li>
<li>
<label>：</label>
<input type="text" name="spare2"/>
</li>
<li>
<label>：</label>
<input type="text" name="spare3"/>
</li>
<li>
<label>：</label>
<input type="text" name="spare4"/>
</li>
<li>
<label>：</label>
<input type="text" name="spare5"/>
</li>
<li>
<label>：</label>
<input type="text" name="spare6"/>
</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="produce:materialRequisitionList:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="produce:materialRequisitionList:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="produce:materialRequisitionList:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="produce:materialRequisitionList: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('produce:materialRequisitionList:edit')}]];
var removeFlag = [[${@permission.hasPermi('produce:materialRequisitionList:remove')}]];
var prefix = ctx + "produce/materialRequisitionList";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "领料单",
columns: [{
checkbox: true
},
{
field: 'materialRequisitionNo',
title: '领料单号'
},
{
field: 'batchNum',
title: '批号'
},
{
field: 'itemCode',
title: '物料代码'
},
{
field: 'itemName',
title: '物料名称'
},
{
field: 'itemSpecification',
title: '规格型号'
},
{
field: 'machineType',
title: '机种'
},
{
field: 'unit',
title: '单位'
},
{
field: 'planQty',
title: '计划数量'
},
{
field: 'qty',
title: '数量'
},
{
field: 'returnQty',
title: '退回数量'
},
{
field: 'coinType',
title: '币别'
},
{
field: 'price',
title: '单价'
},
{
field: 'totalPrice',
title: '总价'
},
{
field: 'depositPosition',
title: '存放位置'
},
{
field: 'remark',
title: '备注'
},
{
field: 'spare1',
title: ''
},
{
field: 'spare2',
title: ''
},
{
field: 'spare3',
title: ''
},
{
field: 'spare4',
title: ''
},
{
field: 'spare5',
title: ''
},
{
field: 'spare6',
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.materialRequisitionNo + '\')"><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.materialRequisitionNo + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save