From 4f9447d5352eb943306d92f43e0124d4988d514c Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 22 Oct 2024 10:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84bom=E8=BE=85=E6=96=99=E5=AF=B9=E8=B1=A1=20sys?= =?UTF-8?q?=5Fbom=5Fsubsidiary=5Fmaterial=E5=92=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E8=BE=85=E6=96=99=E8=B5=84=E6=96=99=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=20sys=5Fsubsidiary=5Fmaterial=E5=92=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysBomSubsidiaryMaterialController.java | 214 ------- .../SysSubsidiaryMaterialController.java | 169 ------ .../domain/SysBomSubsidiaryMaterial.java | 239 -------- .../system/domain/SysSubsidiaryMaterial.java | 570 ------------------ .../SysBomSubsidiaryMaterialMapper.java | 69 --- .../mapper/SysSubsidiaryMaterialMapper.java | 65 -- .../ISysBomSubsidiaryMaterialService.java | 71 --- .../ISysSubsidiaryMaterialService.java | 66 -- .../SysBomSubsidiaryMaterialServiceImpl.java | 106 ---- .../SysSubsidiaryMaterialServiceImpl.java | 102 ---- .../system/SysBomSubsidiaryMaterialMapper.xml | 121 ---- .../system/SysSubsidiaryMaterialMapper.xml | 211 ------- .../system/bomsubsidiarymaterial/add.html | 103 ---- .../bomsubsidiarymaterial.html | 142 ----- .../system/bomsubsidiarymaterial/edit.html | 104 ---- .../system/subsidiarymaterial/add.html | 383 ------------ .../system/subsidiarymaterial/edit.html | 389 ------------ .../subsidiarymaterial.html | 354 ----------- 18 files changed, 3478 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysBomSubsidiaryMaterialController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSubsidiaryMaterialController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBomSubsidiaryMaterial.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSubsidiaryMaterial.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysBomSubsidiaryMaterialMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSubsidiaryMaterialMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysBomSubsidiaryMaterialService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSubsidiaryMaterialService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysBomSubsidiaryMaterialServiceImpl.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSubsidiaryMaterialServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysBomSubsidiaryMaterialMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysSubsidiaryMaterialMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/bomsubsidiarymaterial.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/subsidiarymaterial.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysBomSubsidiaryMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysBomSubsidiaryMaterialController.java deleted file mode 100644 index 152222ae..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysBomSubsidiaryMaterialController.java +++ /dev/null @@ -1,214 +0,0 @@ -package com.ruoyi.system.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.system.domain.SysBomSubsidiaryMaterial; -import com.ruoyi.system.domain.SysSubsidiaryMaterial; -import com.ruoyi.system.service.ISysBomSubsidiaryMaterialService; -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; - -import static com.ruoyi.common.core.domain.AjaxResult.Type.SUCCESS; - -/** - * bom辅料Controller - * - * @author ruoyi - * @date 2022-11-07 - */ -@Controller -@RequestMapping("/system/bomsubsidiarymaterial") -public class SysBomSubsidiaryMaterialController extends BaseController -{ - private final String prefix = "system/bomsubsidiarymaterial"; - - @Autowired - private ISysBomSubsidiaryMaterialService sysBomSubsidiaryMaterialService; - - @RequiresPermissions("system:bomsubsidiarymaterial:view") - @GetMapping() - public String bomsubsidiarymaterial() - { - return prefix + "/bomsubsidiarymaterial"; - } - - /** - * 查询bom辅料列表 - */ - @RequiresPermissions("system:bomsubsidiarymaterial:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial) - { - startPage(); - List list = sysBomSubsidiaryMaterialService.selectSysBomSubsidiaryMaterialList(sysBomSubsidiaryMaterial); - return getDataTable(list); - } - - /** - * 导出bom辅料列表 - */ - @RequiresPermissions("system:bomsubsidiarymaterial:export") - @Log(title = "bom辅料", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial) - { - List list = sysBomSubsidiaryMaterialService.selectSysBomSubsidiaryMaterialList(sysBomSubsidiaryMaterial); - ExcelUtil util = new ExcelUtil(SysBomSubsidiaryMaterial.class); - return util.exportExcel(list, "bom辅料数据"); - } - - /** - * 新增bom辅料 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存bom辅料 - */ - @RequiresPermissions("system:bomsubsidiarymaterial:add") - @Log(title = "bom辅料", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(@RequestParam(value = "data") String data) - { - -// 反序列化 - List sysBomSubsidiaryMaterialList = JSONObject.parseArray(data, SysBomSubsidiaryMaterial.class); - - int i=0; - for(;i sysBomSubsidiaryMaterialList = JSONObject.parseArray(data, SysBomSubsidiaryMaterial.class); - - int i=0; - for(;i4){ - sysBomSubsidiaryMaterialService.updateSysBomSubsidiaryMaterial(sysBomSubsidiaryMaterialList.get(i)); - }else { - sysBomSubsidiaryMaterialService.insertSysBomSubsidiaryMaterial(sysBomSubsidiaryMaterialList.get(i)); - } - - } - return new AjaxResult(SUCCESS, "test done"); - } - - - //更新数据 - @PostMapping("/updateSubsidiary") - @ResponseBody - public AjaxResult updateSave(@RequestParam(value = "data") String data) - { - -// 反序列化 - List sysBomSubsidiaryMaterialList = JSONObject.parseArray(data, SysBomSubsidiaryMaterial.class); - int i=0; - for(;i getFinishCode(String finishProductCode){ - System.out.print("111111111111111111111"); - System.out.print(finishProductCode); - return sysBomSubsidiaryMaterialService.selectfinishProductCodeByCode(finishProductCode); - - } - - // 根据成品删除 - - @PostMapping("/removeFinish") - @ResponseBody - public String removeFinish( @RequestParam(value = "finishProductCode") String finishProductCode) { - sysBomSubsidiaryMaterialService.deleteFinishProductCode(finishProductCode); - return "成功"; - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSubsidiaryMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSubsidiaryMaterialController.java deleted file mode 100644 index 093219f8..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSubsidiaryMaterialController.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.ruoyi.system.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.system.domain.SysBomSubsidiaryMaterial; -import com.ruoyi.system.domain.SysSubsidiaryMaterial; -import com.ruoyi.system.service.ISysSubsidiaryMaterialService; -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; - -import static com.ruoyi.common.core.domain.AjaxResult.Type.ERROR; - -/** - * 辅料资料Controller - * - * @author ruoyi - * @date 2022-11-03 - */ -@Controller -@RequestMapping("/system/subsidiarymaterial") -public class SysSubsidiaryMaterialController extends BaseController -{ - private String prefix = "system/subsidiarymaterial"; - - @Autowired - private ISysSubsidiaryMaterialService sysSubsidiaryMaterialService; - - @RequiresPermissions("system:subsidiarymaterial:view") - @GetMapping() - public String subsidiarymaterial() - { - return prefix + "/subsidiarymaterial"; - } - - /** - * 查询辅料资料列表 - */ - @RequiresPermissions("system:subsidiarymaterial:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(SysSubsidiaryMaterial sysSubsidiaryMaterial) - { - startPage(); - List list = sysSubsidiaryMaterialService.selectSysSubsidiaryMaterialList(sysSubsidiaryMaterial); - return getDataTable(list); - } - - @PostMapping("/itemList") - @ResponseBody - public TableDataInfo itemList(SysSubsidiaryMaterial sysSubsidiaryMaterial) { - startPage(); - List list = sysSubsidiaryMaterialService.selectSysSubsidiaryMaterialList(sysSubsidiaryMaterial); - return getDataTable(list); - } - - /** - * 导出辅料资料列表 - */ - @RequiresPermissions("system:subsidiarymaterial:export") - @Log(title = "辅料资料", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(SysSubsidiaryMaterial sysSubsidiaryMaterial) - { - List list = sysSubsidiaryMaterialService.selectSysSubsidiaryMaterialList(sysSubsidiaryMaterial); - ExcelUtil util = new ExcelUtil(SysSubsidiaryMaterial.class); - return util.exportExcel(list, "辅料资料数据"); - } - - /** - * 新增辅料资料 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存辅料资料 - */ - @RequiresPermissions("system:subsidiarymaterial:add") - @Log(title = "辅料资料", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(SysSubsidiaryMaterial sysSubsidiaryMaterial) - - { - String SubsidiaryLength= String.valueOf(sysSubsidiaryMaterialService.selectSysSubsidiaryMaterialByCode(sysSubsidiaryMaterial.getSubsidiaryMaterialCode())); - if(SubsidiaryLength.length()>4){ - return new AjaxResult(ERROR, "此辅料代码已存在，不可重复添加"); - }else { - return toAjax(sysSubsidiaryMaterialService.insertSysSubsidiaryMaterial(sysSubsidiaryMaterial)); - } - - } - - - @PostMapping("/addFromBom") - @ResponseBody - public AjaxResult addFromBom(@RequestParam(value="data") String data) { - SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial = JSONObject.parseObject(data, SysBomSubsidiaryMaterial.class); - System.out.println(sysBomSubsidiaryMaterial); - SysSubsidiaryMaterial sysSubsidiaryMaterial = new SysSubsidiaryMaterial(); - sysSubsidiaryMaterial.setSubsidiaryMaterialCode(sysBomSubsidiaryMaterial.getSubsidiaryMaterialCode()); - sysSubsidiaryMaterial.setSubsidiaryMaterialName(sysBomSubsidiaryMaterial.getSubsidiaryMaterialName()); - sysSubsidiaryMaterial.setSpecificationModel(sysBomSubsidiaryMaterial.getSpecificationModel()); - sysSubsidiaryMaterial.setInventoryUnit(sysBomSubsidiaryMaterial.getInventoryUnit()); - sysSubsidiaryMaterial.setSupplierNumber(sysBomSubsidiaryMaterial.getSupplierNumber()); - return toAjax(sysSubsidiaryMaterialService.insertSysSubsidiaryMaterial(sysSubsidiaryMaterial)); - } - - - /** - * 修改辅料资料 - */ - @GetMapping("/edit/{subsidiaryMaterialId}") - public String edit(@PathVariable("subsidiaryMaterialId") Long subsidiaryMaterialId, ModelMap mmap) - { - SysSubsidiaryMaterial sysSubsidiaryMaterial = sysSubsidiaryMaterialService.selectSysSubsidiaryMaterialById(subsidiaryMaterialId); - mmap.put("sysSubsidiaryMaterial", sysSubsidiaryMaterial); - return prefix + "/edit"; - } - - /** - * 修改保存辅料资料 - */ - @RequiresPermissions("system:subsidiarymaterial:edit") - @Log(title = "辅料资料", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(SysSubsidiaryMaterial sysSubsidiaryMaterial) - { - return toAjax(sysSubsidiaryMaterialService.updateSysSubsidiaryMaterial(sysSubsidiaryMaterial)); - } - - /** - * 删除辅料资料 - */ - @RequiresPermissions("system:subsidiarymaterial:remove") - @Log(title = "辅料资料", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(sysSubsidiaryMaterialService.deleteSysSubsidiaryMaterialByIds(ids)); - } - -// 根据辅料代码查找数据 - - @PostMapping( "/getSubsidiaryCode") - @ResponseBody - public SysSubsidiaryMaterial getSubsidiaryCode(@RequestParam(value = "subsidiaryMaterialCode") String subsidiaryMaterialCode){ - System.out.print("111111111111111111111"); - System.out.print(subsidiaryMaterialCode); - return sysSubsidiaryMaterialService.selectSysSubsidiaryMaterialByCode(subsidiaryMaterialCode); - - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBomSubsidiaryMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBomSubsidiaryMaterial.java deleted file mode 100644 index 2b909fa2..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBomSubsidiaryMaterial.java +++ /dev/null @@ -1,239 +0,0 @@ -package com.ruoyi.system.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; - -/** - * bom辅料对象 sys_bom_subsidiary_material - * - * @author ruoyi - * @date 2022-11-07 - */ -public class SysBomSubsidiaryMaterial extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** bom辅料id */ - private Long subsidiaryMaterialId; - - /** 成品代码 */ - @Excel(name = "成品代码") - private String finishProductCode; - /** 版本号 */ - @Excel(name = "版本号") - private String versionNumber; - - /** 辅料代码 */ - @Excel(name = "辅料代码") - private String subsidiaryMaterialCode; - - /** 辅料名称 */ - @Excel(name = "辅料名称") - private String subsidiaryMaterialName; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String specificationModel; - - /** 单位 */ - @Excel(name = "单位") - private String inventoryUnit; - - /** 用量 */ - @Excel(name = "用量") - private String subsidiaryMaterialConsumption; - - /** 损耗% */ - @Excel(name = "损耗%") - private String subsidiaryMaterialLoss; - - /** 厂商料号 */ - @Excel(name = "厂商料号") - private String supplierNumber; - - /** 成品数量 */ - @Excel(name = "成品数量") - private String finishedProductQuantity; - - /** 备注说明 */ - @Excel(name = "备注说明") - private String remarks; - - /** 加工类别 */ - @Excel(name = "加工类别") - private String processingCategory; - - /** 备用一 */ - @Excel(name = "备用一") - private String standbyOne; - - /** 备用二 */ - @Excel(name = "备用二") - private String standbyTwo; - - public SysBomSubsidiaryMaterial() { - } - - public SysBomSubsidiaryMaterial(String finishProductCode) { - this.finishProductCode = finishProductCode; - } - - public void setSubsidiaryMaterialId(Long subsidiaryMaterialId) - { - this.subsidiaryMaterialId = subsidiaryMaterialId; - } - - public Long getSubsidiaryMaterialId() - { - return subsidiaryMaterialId; - } - - public String getVersionNumber() { - return versionNumber; - } - - public void setVersionNumber(String versionNumber) { - this.versionNumber = versionNumber; - } - - public void setFinishProductCode(String finishProductCode) - { - this.finishProductCode = finishProductCode; - } - - public String getFinishProductCode() - { - return finishProductCode; - } - public void setSubsidiaryMaterialCode(String subsidiaryMaterialCode) - { - this.subsidiaryMaterialCode = subsidiaryMaterialCode; - } - - public String getSubsidiaryMaterialCode() - { - return subsidiaryMaterialCode; - } - public void setSubsidiaryMaterialName(String subsidiaryMaterialName) - { - this.subsidiaryMaterialName = subsidiaryMaterialName; - } - - public String getSubsidiaryMaterialName() - { - return subsidiaryMaterialName; - } - public void setSpecificationModel(String specificationModel) - { - this.specificationModel = specificationModel; - } - - public String getSpecificationModel() - { - return specificationModel; - } - public void setInventoryUnit(String inventoryUnit) - { - this.inventoryUnit = inventoryUnit; - } - - public String getInventoryUnit() - { - return inventoryUnit; - } - public void setSubsidiaryMaterialConsumption(String subsidiaryMaterialConsumption) - { - this.subsidiaryMaterialConsumption = subsidiaryMaterialConsumption; - } - - public String getSubsidiaryMaterialConsumption() - { - return subsidiaryMaterialConsumption; - } - public void setSubsidiaryMaterialLoss(String subsidiaryMaterialLoss) - { - this.subsidiaryMaterialLoss = subsidiaryMaterialLoss; - } - - public String getSubsidiaryMaterialLoss() - { - return subsidiaryMaterialLoss; - } - public void setSupplierNumber(String supplierNumber) - { - this.supplierNumber = supplierNumber; - } - - public String getSupplierNumber() - { - return supplierNumber; - } - public void setFinishedProductQuantity(String finishedProductQuantity) - { - this.finishedProductQuantity = finishedProductQuantity; - } - - public String getFinishedProductQuantity() - { - return finishedProductQuantity; - } - public void setRemarks(String remarks) - { - this.remarks = remarks; - } - - public String getRemarks() - { - return remarks; - } - public void setProcessingCategory(String processingCategory) - { - this.processingCategory = processingCategory; - } - - public String getProcessingCategory() - { - return processingCategory; - } - public void setStandbyOne(String standbyOne) - { - this.standbyOne = standbyOne; - } - - public String getStandbyOne() - { - return standbyOne; - } - public void setStandbyTwo(String standbyTwo) - { - this.standbyTwo = standbyTwo; - } - - public String getStandbyTwo() - { - return standbyTwo; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("subsidiaryMaterialId", getSubsidiaryMaterialId()) - .append("finishProductCode", getFinishProductCode()) - .append("versionNumber", getVersionNumber()) - .append("subsidiaryMaterialCode", getSubsidiaryMaterialCode()) - .append("subsidiaryMaterialName", getSubsidiaryMaterialName()) - .append("specificationModel", getSpecificationModel()) - .append("inventoryUnit", getInventoryUnit()) - .append("subsidiaryMaterialConsumption", getSubsidiaryMaterialConsumption()) - .append("subsidiaryMaterialLoss", getSubsidiaryMaterialLoss()) - .append("supplierNumber", getSupplierNumber()) - .append("finishedProductQuantity", getFinishedProductQuantity()) - .append("remarks", getRemarks()) - .append("processingCategory", getProcessingCategory()) - .append("standbyOne", getStandbyOne()) - .append("standbyTwo", getStandbyTwo()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSubsidiaryMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSubsidiaryMaterial.java deleted file mode 100644 index 353997d3..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSubsidiaryMaterial.java +++ /dev/null @@ -1,570 +0,0 @@ -package com.ruoyi.system.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; - -/** - * 辅料资料对象 sys_subsidiary_material - * - * @author ruoyi - * @date 2022-11-03 - */ -public class SysSubsidiaryMaterial extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 辅料id */ - private Long subsidiaryMaterialId; - - /** 辅料代码 */ - @Excel(name = "辅料代码") - private String subsidiaryMaterialCode; - - /** 海关HS号 */ - @Excel(name = "海关HS号") - private String hsNumber; - - /** 辅料名称 */ - @Excel(name = "辅料名称") - private String subsidiaryMaterialName; - - /** 单位重量 */ - @Excel(name = "单位重量") - private String stockUnitWeight; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String specificationModel; - - /** 库存单位 */ - @Excel(name = "库存单位") - private String inventoryUnit; - - /** 是否专用 */ - @Excel(name = "是否专用") - private String dedicatedWhether; - - /** 海关名称 */ - @Excel(name = "海关名称") - private String customsName; - - /** 安全库存 */ - @Excel(name = "安全库存") - private String safetyStock; - - /** 备注说明 */ - @Excel(name = "备注说明") - private String remarks; - - /** 专用部门或人 */ - @Excel(name = "专用部门或人") - private String specialUse; - - /** 料号是否停用 */ - @Excel(name = "料号是否停用") - private String whetherStop; - - /** 供应商料号 */ - @Excel(name = "供应商料号") - private String supplierNumber; - - /** 限额领用数 */ - @Excel(name = "限额领用数") - private String limitCollectionAmount; - - /** 辅料类别 */ - @Excel(name = "辅料类别") - private String subsidiaryMaterialCategory; - - /** 默认仓库 */ - @Excel(name = "默认仓库") - private String defaultWarehouse; - - /** 库位 */ - @Excel(name = "库位") - private String warehouseLocation; - - /** 采购价格 */ - @Excel(name = "采购价格") - private String purchasePrice; - - /** 采购提前期 */ - @Excel(name = "采购提前期") - private String purchaseLeadTime; - - /** 最小批量 */ - @Excel(name = "最小批量") - private String minimumBatchSize; - - /** 供应商代码 */ - @Excel(name = "供应商代码") - private String supplierCode; - - /** 供应商名称 */ - @Excel(name = "供应商名称") - private String supplierName; - - /** 限额领用否 */ - @Excel(name = "限额领用否") - private String limitWhether; - - /** 最大采购量 */ - @Excel(name = "最大采购量") - private String maximumPurchaseQuantity; - - /** 成本价 */ - @Excel(name = "成本价") - private String costPrice; - - /** 主供应商 */ - @Excel(name = "主供应商") - private String primarySupplier; - - /** 次供应商 */ - @Excel(name = "次供应商") - private String subSupplier; - - /** 最高库存 */ - @Excel(name = "最高库存") - private String maximumInventory; - - /** 滞留天数 */ - @Excel(name = "滞留天数") - private String detentionDays; - - /** GP项选择 */ - @Excel(name = "GP项选择") - private String gpItemSelection; - - /** 内外销 */ - @Excel(name = "内外销") - private String exportSales; - - /** 创建人 */ - @Excel(name = "创建人") - private String createrName; - - /** 类别 */ - @Excel(name = "类别") - private String materialCategory; - - /** 科恩仕料号 */ - @Excel(name = "科恩仕料号") - private String kesNumber; - - /** 机种 */ - @Excel(name = "机种") - private String typeMachine; - - - /** 录入时间 */ - @Excel(name = "录入时间") - private String firstAddTime; - - /** 修改时间 */ - @Excel(name = "修改时间") - private String updateInfoTime; - - - /** 创建时间 */ - @Excel(name = "创建时间") - private String createrTime; - - public void setSubsidiaryMaterialId(Long subsidiaryMaterialId) - { - this.subsidiaryMaterialId = subsidiaryMaterialId; - } - - public Long getSubsidiaryMaterialId() - { - return subsidiaryMaterialId; - } - public void setSubsidiaryMaterialCode(String subsidiaryMaterialCode) - { - this.subsidiaryMaterialCode = subsidiaryMaterialCode; - } - - public String getSubsidiaryMaterialCode() - { - return subsidiaryMaterialCode; - } - public void setHsNumber(String hsNumber) - { - this.hsNumber = hsNumber; - } - - public String getHsNumber() - { - return hsNumber; - } - public void setSubsidiaryMaterialName(String subsidiaryMaterialName) - { - this.subsidiaryMaterialName = subsidiaryMaterialName; - } - - public String getSubsidiaryMaterialName() - { - return subsidiaryMaterialName; - } - public void setStockUnitWeight(String stockUnitWeight) - { - this.stockUnitWeight = stockUnitWeight; - } - - public String getStockUnitWeight() - { - return stockUnitWeight; - } - public void setSpecificationModel(String specificationModel) - { - this.specificationModel = specificationModel; - } - - public String getSpecificationModel() - { - return specificationModel; - } - public void setInventoryUnit(String inventoryUnit) - { - this.inventoryUnit = inventoryUnit; - } - - public String getInventoryUnit() - { - return inventoryUnit; - } - public void setDedicatedWhether(String dedicatedWhether) - { - this.dedicatedWhether = dedicatedWhether; - } - - public String getDedicatedWhether() - { - return dedicatedWhether; - } - public void setCustomsName(String customsName) - { - this.customsName = customsName; - } - - public String getCustomsName() - { - return customsName; - } - public void setSafetyStock(String safetyStock) - { - this.safetyStock = safetyStock; - } - - public String getSafetyStock() - { - return safetyStock; - } - public void setRemarks(String remarks) - { - this.remarks = remarks; - } - - public String getRemarks() - { - return remarks; - } - public void setSpecialUse(String specialUse) - { - this.specialUse = specialUse; - } - - public String getSpecialUse() - { - return specialUse; - } - public void setWhetherStop(String whetherStop) - { - this.whetherStop = whetherStop; - } - - public String getWhetherStop() - { - return whetherStop; - } - public void setSupplierNumber(String supplierNumber) - { - this.supplierNumber = supplierNumber; - } - - public String getSupplierNumber() - { - return supplierNumber; - } - public void setLimitCollectionAmount(String limitCollectionAmount) - { - this.limitCollectionAmount = limitCollectionAmount; - } - - public String getLimitCollectionAmount() - { - return limitCollectionAmount; - } - public void setSubsidiaryMaterialCategory(String subsidiaryMaterialCategory) - { - this.subsidiaryMaterialCategory = subsidiaryMaterialCategory; - } - - public String getSubsidiaryMaterialCategory() - { - return subsidiaryMaterialCategory; - } - public void setDefaultWarehouse(String defaultWarehouse) - { - this.defaultWarehouse = defaultWarehouse; - } - - public String getDefaultWarehouse() - { - return defaultWarehouse; - } - public void setWarehouseLocation(String warehouseLocation) - { - this.warehouseLocation = warehouseLocation; - } - - public String getWarehouseLocation() - { - return warehouseLocation; - } - public void setPurchasePrice(String purchasePrice) - { - this.purchasePrice = purchasePrice; - } - - public String getPurchasePrice() - { - return purchasePrice; - } - public void setPurchaseLeadTime(String purchaseLeadTime) - { - this.purchaseLeadTime = purchaseLeadTime; - } - - public String getPurchaseLeadTime() - { - return purchaseLeadTime; - } - public void setMinimumBatchSize(String minimumBatchSize) - { - this.minimumBatchSize = minimumBatchSize; - } - - public String getMinimumBatchSize() - { - return minimumBatchSize; - } - public void setSupplierCode(String supplierCode) - { - this.supplierCode = supplierCode; - } - - public String getSupplierCode() - { - return supplierCode; - } - public void setSupplierName(String supplierName) - { - this.supplierName = supplierName; - } - - public String getSupplierName() - { - return supplierName; - } - public void setLimitWhether(String limitWhether) - { - this.limitWhether = limitWhether; - } - - public String getLimitWhether() - { - return limitWhether; - } - public void setMaximumPurchaseQuantity(String maximumPurchaseQuantity) - { - this.maximumPurchaseQuantity = maximumPurchaseQuantity; - } - - public String getMaximumPurchaseQuantity() - { - return maximumPurchaseQuantity; - } - public void setCostPrice(String costPrice) - { - this.costPrice = costPrice; - } - - public String getCostPrice() - { - return costPrice; - } - public void setPrimarySupplier(String primarySupplier) - { - this.primarySupplier = primarySupplier; - } - - public String getPrimarySupplier() - { - return primarySupplier; - } - public void setSubSupplier(String subSupplier) - { - this.subSupplier = subSupplier; - } - - public String getSubSupplier() - { - return subSupplier; - } - public void setMaximumInventory(String maximumInventory) - { - this.maximumInventory = maximumInventory; - } - - public String getMaximumInventory() - { - return maximumInventory; - } - public void setDetentionDays(String detentionDays) - { - this.detentionDays = detentionDays; - } - - public String getDetentionDays() - { - return detentionDays; - } - public void setGpItemSelection(String gpItemSelection) - { - this.gpItemSelection = gpItemSelection; - } - - public String getGpItemSelection() - { - return gpItemSelection; - } - public void setExportSales(String exportSales) - { - this.exportSales = exportSales; - } - - public String getExportSales() - { - return exportSales; - } - public void setCreaterName(String createrName) - { - this.createrName = createrName; - } - - public String getCreaterName() - { - return createrName; - } - public void setMaterialCategory(String materialCategory) - { - this.materialCategory = materialCategory; - } - - public String getMaterialCategory() - { - return materialCategory; - } - public void setKesNumber(String kesNumber) - { - this.kesNumber = kesNumber; - } - - public String getKesNumber() - { - return kesNumber; - } - public void setTypeMachine(String typeMachine) - { - this.typeMachine = typeMachine; - } - - public String getTypeMachine() - { - return typeMachine; - } - - public void setCreaterTime(String createrTime) - { - this.createrTime = createrTime; - } - - public String getCreaterTime() - { - return createrTime; - } - - public String getFirstAddTime() { - return firstAddTime; - } - - public void setFirstAddTime(String firstAddTime) { - this.firstAddTime = firstAddTime; - } - - public String getUpdateInfoTime() { - return updateInfoTime; - } - - public void setUpdateInfoTime(String updateInfoTime) { - this.updateInfoTime = updateInfoTime; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("subsidiaryMaterialId", getSubsidiaryMaterialId()) - .append("subsidiaryMaterialCode", getSubsidiaryMaterialCode()) - .append("hsNumber", getHsNumber()) - .append("subsidiaryMaterialName", getSubsidiaryMaterialName()) - .append("stockUnitWeight", getStockUnitWeight()) - .append("specificationModel", getSpecificationModel()) - .append("inventoryUnit", getInventoryUnit()) - .append("dedicatedWhether", getDedicatedWhether()) - .append("customsName", getCustomsName()) - .append("safetyStock", getSafetyStock()) - .append("remarks", getRemarks()) - .append("specialUse", getSpecialUse()) - .append("whetherStop", getWhetherStop()) - .append("supplierNumber", getSupplierNumber()) - .append("limitCollectionAmount", getLimitCollectionAmount()) - .append("subsidiaryMaterialCategory", getSubsidiaryMaterialCategory()) - .append("defaultWarehouse", getDefaultWarehouse()) - .append("warehouseLocation", getWarehouseLocation()) - .append("purchasePrice", getPurchasePrice()) - .append("purchaseLeadTime", getPurchaseLeadTime()) - .append("minimumBatchSize", getMinimumBatchSize()) - .append("supplierCode", getSupplierCode()) - .append("supplierName", getSupplierName()) - .append("limitWhether", getLimitWhether()) - .append("maximumPurchaseQuantity", getMaximumPurchaseQuantity()) - .append("costPrice", getCostPrice()) - .append("primarySupplier", getPrimarySupplier()) - .append("subSupplier", getSubSupplier()) - .append("maximumInventory", getMaximumInventory()) - .append("detentionDays", getDetentionDays()) - .append("gpItemSelection", getGpItemSelection()) - .append("exportSales", getExportSales()) - .append("createrName", getCreaterName()) - .append("materialCategory", getMaterialCategory()) - .append("kesNumber", getKesNumber()) - .append("typeMachine", getTypeMachine()) - .append("firstAddTime", getFirstAddTime()) - .append("updateInfoTime", getUpdateInfoTime()) - .append("createrTime", getCreaterTime()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysBomSubsidiaryMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysBomSubsidiaryMaterialMapper.java deleted file mode 100644 index adc71000..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysBomSubsidiaryMaterialMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.system.domain.SysBomSubsidiaryMaterial; -import com.ruoyi.system.domain.SysSubsidiaryMaterial; - -import java.util.List; - -/** - * bom辅料Mapper接口 - * - * @author ruoyi - * @date 2022-11-07 - */ -public interface SysBomSubsidiaryMaterialMapper -{ - /** - * 查询bom辅料 - * - * @param subsidiaryMaterialId bom辅料ID - * @return bom辅料 - */ - SysBomSubsidiaryMaterial selectSysBomSubsidiaryMaterialById(Long subsidiaryMaterialId); - - /** - * 查询bom辅料列表 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return bom辅料集合 - */ - List selectSysBomSubsidiaryMaterialList(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial); - - /** - * 新增bom辅料 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return 结果 - */ - int insertSysBomSubsidiaryMaterial(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial); - - /** - * 修改bom辅料 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return 结果 - */ - int updateSysBomSubsidiaryMaterial(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial); - - /** - * 删除bom辅料 - * - * @param subsidiaryMaterialId bom辅料ID - * @return 结果 - */ - int deleteSysBomSubsidiaryMaterialById(Long subsidiaryMaterialId); - - /** - * 批量删除bom辅料 - * - * @param subsidiaryMaterialIds 需要删除的数据ID - * @return 结果 - */ - int deleteSysBomSubsidiaryMaterialByIds(String[] subsidiaryMaterialIds); - - List selectfinishProductCodeByCode(String finishProductCode); - - - int deleteFinishProductCode(String finishProductCode); - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSubsidiaryMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSubsidiaryMaterialMapper.java deleted file mode 100644 index 0e6c9d4c..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSubsidiaryMaterialMapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.system.domain.SysSubsidiaryMaterial; - -import java.util.List; - -/** - * 辅料资料Mapper接口 - * - * @author ruoyi - * @date 2022-11-03 - */ -public interface SysSubsidiaryMaterialMapper -{ - /** - * 查询辅料资料 - * - * @param subsidiaryMaterialId 辅料资料ID - * @return 辅料资料 - */ - public SysSubsidiaryMaterial selectSysSubsidiaryMaterialById(Long subsidiaryMaterialId); - - /** - * 查询辅料资料列表 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 辅料资料集合 - */ - public List selectSysSubsidiaryMaterialList(SysSubsidiaryMaterial sysSubsidiaryMaterial); - - /** - * 新增辅料资料 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 结果 - */ - public int insertSysSubsidiaryMaterial(SysSubsidiaryMaterial sysSubsidiaryMaterial); - - /** - * 修改辅料资料 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 结果 - */ - public int updateSysSubsidiaryMaterial(SysSubsidiaryMaterial sysSubsidiaryMaterial); - - /** - * 删除辅料资料 - * - * @param subsidiaryMaterialId 辅料资料ID - * @return 结果 - */ - public int deleteSysSubsidiaryMaterialById(Long subsidiaryMaterialId); - - /** - * 批量删除辅料资料 - * - * @param subsidiaryMaterialIds 需要删除的数据ID - * @return 结果 - */ - public int deleteSysSubsidiaryMaterialByIds(String[] subsidiaryMaterialIds); - - public SysSubsidiaryMaterial selectSysSubsidiaryMaterialByCode(String subsidiaryMaterialCode); - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysBomSubsidiaryMaterialService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysBomSubsidiaryMaterialService.java deleted file mode 100644 index a9e7b34b..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysBomSubsidiaryMaterialService.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.ruoyi.system.service; - -import com.ruoyi.system.domain.SysBomSubsidiaryMaterial; -import com.ruoyi.system.domain.SysSubsidiaryMaterial; - -import java.util.List; - -/** - * bom辅料Service接口 - * - * @author ruoyi - * @date 2022-11-07 - */ -public interface ISysBomSubsidiaryMaterialService -{ - /** - * 查询bom辅料 - * - * @param subsidiaryMaterialId bom辅料ID - * @return bom辅料 - */ - public SysBomSubsidiaryMaterial selectSysBomSubsidiaryMaterialById(Long subsidiaryMaterialId); - - /** - * 查询bom辅料列表 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return bom辅料集合 - */ - public List selectSysBomSubsidiaryMaterialList(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial); - - /** - * 新增bom辅料 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return 结果 - */ - public int insertSysBomSubsidiaryMaterial(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial); - - /** - * 修改bom辅料 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return 结果 - */ - public int updateSysBomSubsidiaryMaterial(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial); - - /** - * 批量删除bom辅料 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSysBomSubsidiaryMaterialByIds(String ids); - - /** - * 删除bom辅料信息 - * - * @param subsidiaryMaterialId bom辅料ID - * @return 结果 - */ - public int deleteSysBomSubsidiaryMaterialById(Long subsidiaryMaterialId); - - public List selectfinishProductCodeByCode(String finishProductCode); - -// 根据成品代码删除 - - public int deleteFinishProductCode(String finishProductCode); - - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSubsidiaryMaterialService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSubsidiaryMaterialService.java deleted file mode 100644 index d7ad1b8d..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSubsidiaryMaterialService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.ruoyi.system.service; - -import com.ruoyi.system.domain.SysSubsidiaryMaterial; - -import java.util.List; - -/** - * 辅料资料Service接口 - * - * @author ruoyi - * @date 2022-11-03 - */ -public interface ISysSubsidiaryMaterialService -{ - /** - * 查询辅料资料 - * - * @param subsidiaryMaterialId 辅料资料ID - * @return 辅料资料 - */ - public SysSubsidiaryMaterial selectSysSubsidiaryMaterialById(Long subsidiaryMaterialId); - - /** - * 查询辅料资料列表 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 辅料资料集合 - */ - public List selectSysSubsidiaryMaterialList(SysSubsidiaryMaterial sysSubsidiaryMaterial); - - /** - * 新增辅料资料 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 结果 - */ - public int insertSysSubsidiaryMaterial(SysSubsidiaryMaterial sysSubsidiaryMaterial); - - /** - * 修改辅料资料 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 结果 - */ - public int updateSysSubsidiaryMaterial(SysSubsidiaryMaterial sysSubsidiaryMaterial); - - /** - * 批量删除辅料资料 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSysSubsidiaryMaterialByIds(String ids); - - /** - * 删除辅料资料信息 - * - * @param subsidiaryMaterialId 辅料资料ID - * @return 结果 - */ - public int deleteSysSubsidiaryMaterialById(Long subsidiaryMaterialId); - - - public SysSubsidiaryMaterial selectSysSubsidiaryMaterialByCode(String subsidiaryMaterialCode); - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysBomSubsidiaryMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysBomSubsidiaryMaterialServiceImpl.java deleted file mode 100644 index 7bb09ca9..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysBomSubsidiaryMaterialServiceImpl.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.ruoyi.system.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.SysBomSubsidiaryMaterial; -import com.ruoyi.system.domain.SysSubsidiaryMaterial; -import com.ruoyi.system.mapper.SysBomSubsidiaryMaterialMapper; -import com.ruoyi.system.service.ISysBomSubsidiaryMaterialService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * bom辅料Service业务层处理 - * - * @author ruoyi - * @date 2022-11-07 - */ -@Service -public class SysBomSubsidiaryMaterialServiceImpl implements ISysBomSubsidiaryMaterialService -{ - @Autowired - private SysBomSubsidiaryMaterialMapper sysBomSubsidiaryMaterialMapper; - - /** - * 查询bom辅料 - * - * @param subsidiaryMaterialId bom辅料ID - * @return bom辅料 - */ - @Override - public SysBomSubsidiaryMaterial selectSysBomSubsidiaryMaterialById(Long subsidiaryMaterialId) - { - return sysBomSubsidiaryMaterialMapper.selectSysBomSubsidiaryMaterialById(subsidiaryMaterialId); - } - - /** - * 查询bom辅料列表 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return bom辅料 - */ - @Override - public List selectSysBomSubsidiaryMaterialList(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial) - { - return sysBomSubsidiaryMaterialMapper.selectSysBomSubsidiaryMaterialList(sysBomSubsidiaryMaterial); - } - - /** - * 新增bom辅料 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return 结果 - */ - @Override - public int insertSysBomSubsidiaryMaterial(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial) - { - return sysBomSubsidiaryMaterialMapper.insertSysBomSubsidiaryMaterial(sysBomSubsidiaryMaterial); - } - - /** - * 修改bom辅料 - * - * @param sysBomSubsidiaryMaterial bom辅料 - * @return 结果 - */ - @Override - public int updateSysBomSubsidiaryMaterial(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial) - { - return sysBomSubsidiaryMaterialMapper.updateSysBomSubsidiaryMaterial(sysBomSubsidiaryMaterial); - } - - /** - * 删除bom辅料对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteSysBomSubsidiaryMaterialByIds(String ids) - { - return sysBomSubsidiaryMaterialMapper.deleteSysBomSubsidiaryMaterialByIds(Convert.toStrArray(ids)); - } - - /** - * 删除bom辅料信息 - * - * @param subsidiaryMaterialId bom辅料ID - * @return 结果 - */ - @Override - public int deleteSysBomSubsidiaryMaterialById(Long subsidiaryMaterialId) - { - return sysBomSubsidiaryMaterialMapper.deleteSysBomSubsidiaryMaterialById(subsidiaryMaterialId); - } - - @Override - public List selectfinishProductCodeByCode(String finishProductCode) { - return sysBomSubsidiaryMaterialMapper.selectfinishProductCodeByCode(finishProductCode); - } - - @Override - public int deleteFinishProductCode(String finishProductCode) { - return sysBomSubsidiaryMaterialMapper.deleteFinishProductCode(finishProductCode); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSubsidiaryMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSubsidiaryMaterialServiceImpl.java deleted file mode 100644 index 3b14b200..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSubsidiaryMaterialServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.ruoyi.system.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.SysSubsidiaryMaterial; -import com.ruoyi.system.mapper.SysSubsidiaryMaterialMapper; -import com.ruoyi.system.service.ISysSubsidiaryMaterialService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 辅料资料Service业务层处理 - * - * @author ruoyi - * @date 2022-11-03 - */ -@Service -public class SysSubsidiaryMaterialServiceImpl implements ISysSubsidiaryMaterialService -{ - @Autowired - private SysSubsidiaryMaterialMapper sysSubsidiaryMaterialMapper; - - /** - * 查询辅料资料 - * - * @param subsidiaryMaterialId 辅料资料ID - * @return 辅料资料 - */ - @Override - public SysSubsidiaryMaterial selectSysSubsidiaryMaterialById(Long subsidiaryMaterialId) - { - return sysSubsidiaryMaterialMapper.selectSysSubsidiaryMaterialById(subsidiaryMaterialId); - } - - /** - * 查询辅料资料列表 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 辅料资料 - */ - @Override - public List selectSysSubsidiaryMaterialList(SysSubsidiaryMaterial sysSubsidiaryMaterial) - { - return sysSubsidiaryMaterialMapper.selectSysSubsidiaryMaterialList(sysSubsidiaryMaterial); - } - - /** - * 新增辅料资料 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 结果 - */ - @Override - public int insertSysSubsidiaryMaterial(SysSubsidiaryMaterial sysSubsidiaryMaterial) - { - return sysSubsidiaryMaterialMapper.insertSysSubsidiaryMaterial(sysSubsidiaryMaterial); - } - - /** - * 修改辅料资料 - * - * @param sysSubsidiaryMaterial 辅料资料 - * @return 结果 - */ - @Override - public int updateSysSubsidiaryMaterial(SysSubsidiaryMaterial sysSubsidiaryMaterial) - { - return sysSubsidiaryMaterialMapper.updateSysSubsidiaryMaterial(sysSubsidiaryMaterial); - } - - /** - * 删除辅料资料对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteSysSubsidiaryMaterialByIds(String ids) - { - return sysSubsidiaryMaterialMapper.deleteSysSubsidiaryMaterialByIds(Convert.toStrArray(ids)); - } - - /** - * 删除辅料资料信息 - * - * @param subsidiaryMaterialId 辅料资料ID - * @return 结果 - */ - @Override - public int deleteSysSubsidiaryMaterialById(Long subsidiaryMaterialId) - { - return sysSubsidiaryMaterialMapper.deleteSysSubsidiaryMaterialById(subsidiaryMaterialId); - } - - @Override - public SysSubsidiaryMaterial selectSysSubsidiaryMaterialByCode(String subsidiaryMaterialCode) { -// return null; - return sysSubsidiaryMaterialMapper.selectSysSubsidiaryMaterialByCode(subsidiaryMaterialCode); - - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysBomSubsidiaryMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysBomSubsidiaryMaterialMapper.xml deleted file mode 100644 index 59697509..00000000 --- a/ruoyi-admin/src/main/resources/mapper/system/SysBomSubsidiaryMaterialMapper.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select subsidiary_material_id, finish_product_code, version_number, subsidiary_material_code, subsidiary_material_name, specification_model, inventory_unit, subsidiary_material_consumption, subsidiary_material_loss, supplier_number, finished_product_quantity, remarks, processing_category, standby_one, standby_two from sys_bom_subsidiary_material - - - - - - - - - insert into sys_bom_subsidiary_material - - subsidiary_material_id, - finish_product_code, - version_number, - subsidiary_material_code, - subsidiary_material_name, - specification_model, - inventory_unit, - subsidiary_material_consumption, - subsidiary_material_loss, - supplier_number, - finished_product_quantity, - remarks, - processing_category, - standby_one, - standby_two, - - - #{subsidiaryMaterialId}, - #{finishProductCode}, - #{versionNumber}, - #{subsidiaryMaterialCode}, - #{subsidiaryMaterialName}, - #{specificationModel}, - #{inventoryUnit}, - #{subsidiaryMaterialConsumption}, - #{subsidiaryMaterialLoss}, - #{supplierNumber}, - #{finishedProductQuantity}, - #{remarks}, - #{processingCategory}, - #{standbyOne}, - #{standbyTwo}, - - - - - update sys_bom_subsidiary_material - - finish_product_code = #{finishProductCode}, - version_number = #{versionNumber}, - subsidiary_material_code = #{subsidiaryMaterialCode}, - subsidiary_material_name = #{subsidiaryMaterialName}, - specification_model = #{specificationModel}, - inventory_unit = #{inventoryUnit}, - subsidiary_material_consumption = #{subsidiaryMaterialConsumption}, - subsidiary_material_loss = #{subsidiaryMaterialLoss}, - supplier_number = #{supplierNumber}, - finished_product_quantity = #{finishedProductQuantity}, - remarks = #{remarks}, - processing_category = #{processingCategory}, - standby_one = #{standbyOne}, - standby_two = #{standbyTwo}, - - where subsidiary_material_id = #{subsidiaryMaterialId} - - - - delete from sys_bom_subsidiary_material where subsidiary_material_id = #{subsidiaryMaterialId} - - - - delete from sys_bom_subsidiary_material where subsidiary_material_id in - - #{subsidiaryMaterialId} - - - - - delete from sys_bom_subsidiary_material where finish_product_code = #{finishProductCode} - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSubsidiaryMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSubsidiaryMaterialMapper.xml deleted file mode 100644 index 613cb1d0..00000000 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSubsidiaryMaterialMapper.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select subsidiary_material_id, subsidiary_material_code, hs_number, subsidiary_material_name, stock_unit_weight, specification_model, inventory_unit, dedicated_whether, customs_name, safety_stock, remarks, special_use, whether_stop, supplier_number, limit_collection_amount, subsidiary_material_category, default_warehouse, warehouse_location, purchase_price, purchase_lead_time, minimum_batch_size, supplier_code, supplier_name, limit_whether, maximum_purchase_quantity, cost_price, primary_supplier, sub_supplier, maximum_inventory, detention_days, gp_Item_selection, export_sales, creater_name, material_category, kes_number, type_machine, first_add_time, update_info_time, creater_time from sys_subsidiary_material - - - - - - - - - - insert into sys_subsidiary_material - - subsidiary_material_code, - hs_number, - subsidiary_material_name, - stock_unit_weight, - specification_model, - inventory_unit, - dedicated_whether, - customs_name, - safety_stock, - remarks, - special_use, - whether_stop, - supplier_number, - limit_collection_amount, - subsidiary_material_category, - default_warehouse, - warehouse_location, - purchase_price, - purchase_lead_time, - minimum_batch_size, - supplier_code, - supplier_name, - limit_whether, - maximum_purchase_quantity, - cost_price, - primary_supplier, - sub_supplier, - maximum_inventory, - detention_days, - gp_Item_selection, - export_sales, - creater_name, - material_category, - kes_number, - type_machine, - creater_time, - first_add_time, - - - #{subsidiaryMaterialCode}, - #{hsNumber}, - #{subsidiaryMaterialName}, - #{stockUnitWeight}, - #{specificationModel}, - #{inventoryUnit}, - #{dedicatedWhether}, - #{customsName}, - #{safetyStock}, - #{remarks}, - #{specialUse}, - #{whetherStop}, - #{supplierNumber}, - #{limitCollectionAmount}, - #{subsidiaryMaterialCategory}, - #{defaultWarehouse}, - #{warehouseLocation}, - #{purchasePrice}, - #{purchaseLeadTime}, - #{minimumBatchSize}, - #{supplierCode}, - #{supplierName}, - #{limitWhether}, - #{maximumPurchaseQuantity}, - #{costPrice}, - #{primarySupplier}, - #{subSupplier}, - #{maximumInventory}, - #{detentionDays}, - #{gpItemSelection}, - #{exportSales}, - #{createrName}, - #{materialCategory}, - #{kesNumber}, - #{typeMachine}, - #{createrTime}, - now(), - - - - - update sys_subsidiary_material - - subsidiary_material_code = #{subsidiaryMaterialCode}, - hs_number = #{hsNumber}, - subsidiary_material_name = #{subsidiaryMaterialName}, - stock_unit_weight = #{stockUnitWeight}, - specification_model = #{specificationModel}, - inventory_unit = #{inventoryUnit}, - dedicated_whether = #{dedicatedWhether}, - customs_name = #{customsName}, - safety_stock = #{safetyStock}, - remarks = #{remarks}, - special_use = #{specialUse}, - whether_stop = #{whetherStop}, - supplier_number = #{supplierNumber}, - limit_collection_amount = #{limitCollectionAmount}, - subsidiary_material_category = #{subsidiaryMaterialCategory}, - default_warehouse = #{defaultWarehouse}, - warehouse_location = #{warehouseLocation}, - purchase_price = #{purchasePrice}, - purchase_lead_time = #{purchaseLeadTime}, - minimum_batch_size = #{minimumBatchSize}, - supplier_code = #{supplierCode}, - supplier_name = #{supplierName}, - limit_whether = #{limitWhether}, - maximum_purchase_quantity = #{maximumPurchaseQuantity}, - cost_price = #{costPrice}, - primary_supplier = #{primarySupplier}, - sub_supplier = #{subSupplier}, - maximum_inventory = #{maximumInventory}, - detention_days = #{detentionDays}, - gp_Item_selection = #{gpItemSelection}, - export_sales = #{exportSales}, - creater_name = #{createrName}, - material_category = #{materialCategory}, - kes_number = #{kesNumber}, - type_machine = #{typeMachine}, - creater_time = #{createrTime}, - update_info_time = CONCAT_WS(',',NOW(),update_info_time), - - where subsidiary_material_id = #{subsidiaryMaterialId} - - - - delete from sys_subsidiary_material where subsidiary_material_id = #{subsidiaryMaterialId} - - - - delete from sys_subsidiary_material where subsidiary_material_id in - - #{subsidiaryMaterialId} - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/add.html b/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/add.html deleted file mode 100644 index eb0f5477..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/add.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/bomsubsidiarymaterial.html b/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/bomsubsidiarymaterial.html deleted file mode 100644 index 1e111766..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/bomsubsidiarymaterial.html +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/edit.html b/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/edit.html deleted file mode 100644 index f348d320..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/edit.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/add.html b/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/add.html deleted file mode 100644 index 2d8cc72b..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/add.html +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
-
- - -
-
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - - - - - - - - -
- -
-
- - -
-
-
-
-
- - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/edit.html b/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/edit.html deleted file mode 100644 index e3865732..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/edit.html +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
-
- - -
-
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - - - - - - - - -
- -
-
- - -
-
-
-
-
- - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/subsidiarymaterial.html b/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/subsidiarymaterial.html deleted file mode 100644 index c4267b1e..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/subsidiarymaterial.html +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - - - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file