diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/MaterialRequisitionListController.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/MaterialRequisitionListController.java deleted file mode 100644 index 91694040..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/MaterialRequisitionListController.java +++ /dev/null @@ -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 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 list = materialRequisitionListService.selectMaterialRequisitionListList(materialRequisitionList); - ExcelUtil util = new ExcelUtil(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)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/MaterialRequisitionList.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/MaterialRequisitionList.java deleted file mode 100644 index 804f741d..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/MaterialRequisitionList.java +++ /dev/null @@ -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(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/MaterialRequisitionListMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/MaterialRequisitionListMapper.java deleted file mode 100644 index 0b682be0..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/MaterialRequisitionListMapper.java +++ /dev/null @@ -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 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); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IMaterialRequisitionListService.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IMaterialRequisitionListService.java deleted file mode 100644 index 784d2258..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IMaterialRequisitionListService.java +++ /dev/null @@ -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 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); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/MaterialRequisitionListServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/MaterialRequisitionListServiceImpl.java deleted file mode 100644 index 071dd375..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/MaterialRequisitionListServiceImpl.java +++ /dev/null @@ -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 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); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/produce/MaterialRequisitionListMapper.xml b/ruoyi-admin/src/main/resources/mapper/produce/MaterialRequisitionListMapper.xml deleted file mode 100644 index 828319f9..00000000 --- a/ruoyi-admin/src/main/resources/mapper/produce/MaterialRequisitionListMapper.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into material_requisition_list - - materialRequisitionNo, - batchNum, - itemCode, - itemName, - itemSpecification, - machineType, - unit, - planQty, - qty, - returnQty, - coinType, - price, - totalPrice, - depositPosition, - remark, - spare1, - spare2, - spare3, - spare4, - spare5, - spare6, - - - #{materialRequisitionNo}, - #{batchNum}, - #{itemCode}, - #{itemName}, - #{itemSpecification}, - #{machineType}, - #{unit}, - #{planQty}, - #{qty}, - #{returnQty}, - #{coinType}, - #{price}, - #{totalPrice}, - #{depositPosition}, - #{remark}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, - - - - - update material_requisition_list - - batchNum = #{batchNum}, - itemCode = #{itemCode}, - itemName = #{itemName}, - itemSpecification = #{itemSpecification}, - machineType = #{machineType}, - unit = #{unit}, - planQty = #{planQty}, - qty = #{qty}, - returnQty = #{returnQty}, - coinType = #{coinType}, - price = #{price}, - totalPrice = #{totalPrice}, - depositPosition = #{depositPosition}, - remark = #{remark}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, - spare5 = #{spare5}, - spare6 = #{spare6}, - - where materialRequisitionNo = #{materialRequisitionNo} - - - - delete from material_requisition_list where materialRequisitionNo = #{materialRequisitionNo} - - - - delete from material_requisition_list where materialRequisitionNo in - - #{materialRequisitionNo} - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/add.html b/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/add.html deleted file mode 100644 index f83e8a5d..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/add.html +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/edit.html b/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/edit.html deleted file mode 100644 index f2a85c53..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/edit.html +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/materialRequisitionList.html b/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/materialRequisitionList.html deleted file mode 100644 index 7d04073a..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionList/materialRequisitionList.html +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • -  搜索 -  重置 -
  • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file