Browse Source

删除旧版无用的bom辅料对象 sys_bom_subsidiary_material和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据

删除旧版无用的辅料资料对象 sys_subsidiary_material和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据
dev
liuxiaoxu 4 months ago
parent
commit
4f9447d535
  1. 214
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysBomSubsidiaryMaterialController.java
  2. 169
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSubsidiaryMaterialController.java
  3. 239
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBomSubsidiaryMaterial.java
  4. 570
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSubsidiaryMaterial.java
  5. 69
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysBomSubsidiaryMaterialMapper.java
  6. 65
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSubsidiaryMaterialMapper.java
  7. 71
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysBomSubsidiaryMaterialService.java
  8. 66
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSubsidiaryMaterialService.java
  9. 106
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysBomSubsidiaryMaterialServiceImpl.java
  10. 102
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSubsidiaryMaterialServiceImpl.java
  11. 121
      ruoyi-admin/src/main/resources/mapper/system/SysBomSubsidiaryMaterialMapper.xml
  12. 211
      ruoyi-admin/src/main/resources/mapper/system/SysSubsidiaryMaterialMapper.xml
  13. 103
      ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/add.html
  14. 142
      ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/bomsubsidiarymaterial.html
  15. 104
      ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/edit.html
  16. 383
      ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/add.html
  17. 389
      ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/edit.html
  18. 354
      ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/subsidiarymaterial.html

214
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysBomSubsidiaryMaterialController.java

@ -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<SysBomSubsidiaryMaterial> 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<SysBomSubsidiaryMaterial> list = sysBomSubsidiaryMaterialService.selectSysBomSubsidiaryMaterialList(sysBomSubsidiaryMaterial);
ExcelUtil<SysBomSubsidiaryMaterial> util = new ExcelUtil<SysBomSubsidiaryMaterial>(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<SysBomSubsidiaryMaterial> sysBomSubsidiaryMaterialList = JSONObject.parseArray(data, SysBomSubsidiaryMaterial.class);
int i=0;
for(;i<sysBomSubsidiaryMaterialList.size();i++){
sysBomSubsidiaryMaterialService.insertSysBomSubsidiaryMaterial(sysBomSubsidiaryMaterialList.get(i));
}
return new AjaxResult(SUCCESS, "test done");
}
/**
* 新增保存bom辅料
*/
@RequiresPermissions("system:bomsubsidiarymaterial:editAdd")
@Log(title = "bom辅料", businessType = BusinessType.INSERT)
@PostMapping("/editAdd")
@ResponseBody
public AjaxResult editAddSave(@RequestParam(value = "data") String data)
{
// 反序列化
List<SysBomSubsidiaryMaterial> sysBomSubsidiaryMaterialList = JSONObject.parseArray(data, SysBomSubsidiaryMaterial.class);
int i=0;
for(;i<sysBomSubsidiaryMaterialList.size();i++){
String SubsidiaryLength= String.valueOf(sysBomSubsidiaryMaterialService.selectSysBomSubsidiaryMaterialById(sysBomSubsidiaryMaterialList.get(i).getSubsidiaryMaterialId()));
if (SubsidiaryLength.length()>4){
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<SysBomSubsidiaryMaterial> sysBomSubsidiaryMaterialList = JSONObject.parseArray(data, SysBomSubsidiaryMaterial.class);
int i=0;
for(;i<sysBomSubsidiaryMaterialList.size();i++){
sysBomSubsidiaryMaterialService.updateSysBomSubsidiaryMaterial(sysBomSubsidiaryMaterialList.get(i));
}
return new AjaxResult(SUCCESS, "test done");
}
/**
* 修改bom辅料
*/
@GetMapping("/edit/{subsidiaryMaterialId}")
public String edit(@PathVariable("subsidiaryMaterialId") Long subsidiaryMaterialId, ModelMap mmap)
{
SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial = sysBomSubsidiaryMaterialService.selectSysBomSubsidiaryMaterialById(subsidiaryMaterialId);
mmap.put("sysBomSubsidiaryMaterial", sysBomSubsidiaryMaterial);
return prefix + "/edit";
}
/**
* 修改保存bom辅料
*/
@RequiresPermissions("system:bomsubsidiarymaterial:edit")
@Log(title = "bom辅料", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(SysBomSubsidiaryMaterial sysBomSubsidiaryMaterial)
{
return toAjax(sysBomSubsidiaryMaterialService.updateSysBomSubsidiaryMaterial(sysBomSubsidiaryMaterial));
}
/**
* 删除bom辅料
*/
@RequiresPermissions("system:bomsubsidiarymaterial:remove")
@Log(title = "bom辅料", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
System.out.printf(ids);
return toAjax(sysBomSubsidiaryMaterialService.deleteSysBomSubsidiaryMaterialByIds(ids));
}
@PostMapping( "/removeSubsidiary")
@ResponseBody
public String removeSubsidiary(@RequestParam(value = "subsidiaryMaterialId") String ids)
{
System.out.printf(ids);
sysBomSubsidiaryMaterialService.deleteSysBomSubsidiaryMaterialByIds(ids);
return "删除成功";
}
// 根据成品代码查找数据
@PostMapping( "/getFinishCode")
@ResponseBody
public List<SysSubsidiaryMaterial> 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 "成功";
}
}

169
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSubsidiaryMaterialController.java

@ -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<SysSubsidiaryMaterial> list = sysSubsidiaryMaterialService.selectSysSubsidiaryMaterialList(sysSubsidiaryMaterial);
return getDataTable(list);
}
@PostMapping("/itemList")
@ResponseBody
public TableDataInfo itemList(SysSubsidiaryMaterial sysSubsidiaryMaterial) {
startPage();
List<SysSubsidiaryMaterial> 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<SysSubsidiaryMaterial> list = sysSubsidiaryMaterialService.selectSysSubsidiaryMaterialList(sysSubsidiaryMaterial);
ExcelUtil<SysSubsidiaryMaterial> util = new ExcelUtil<SysSubsidiaryMaterial>(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);
}
}

239
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysBomSubsidiaryMaterial.java

@ -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();
}
}

570
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSubsidiaryMaterial.java

@ -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();
}
}

69
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysBomSubsidiaryMaterialMapper.java

@ -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<SysBomSubsidiaryMaterial> 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<SysSubsidiaryMaterial> selectfinishProductCodeByCode(String finishProductCode);
int deleteFinishProductCode(String finishProductCode);
}

65
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSubsidiaryMaterialMapper.java

@ -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<SysSubsidiaryMaterial> 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);
}

71
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysBomSubsidiaryMaterialService.java

@ -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<SysBomSubsidiaryMaterial> 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<SysSubsidiaryMaterial> selectfinishProductCodeByCode(String finishProductCode);
// 根据成品代码删除
public int deleteFinishProductCode(String finishProductCode);
}

66
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSubsidiaryMaterialService.java

@ -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<SysSubsidiaryMaterial> 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);
}

106
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysBomSubsidiaryMaterialServiceImpl.java

@ -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<SysBomSubsidiaryMaterial> 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<SysSubsidiaryMaterial> selectfinishProductCodeByCode(String finishProductCode) {
return sysBomSubsidiaryMaterialMapper.selectfinishProductCodeByCode(finishProductCode);
}
@Override
public int deleteFinishProductCode(String finishProductCode) {
return sysBomSubsidiaryMaterialMapper.deleteFinishProductCode(finishProductCode);
}
}

102
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSubsidiaryMaterialServiceImpl.java

@ -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<SysSubsidiaryMaterial> 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);
}
}

121
ruoyi-admin/src/main/resources/mapper/system/SysBomSubsidiaryMaterialMapper.xml

@ -1,121 +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.system.mapper.SysBomSubsidiaryMaterialMapper">
<resultMap type="SysBomSubsidiaryMaterial" id="SysBomSubsidiaryMaterialResult">
<result property="subsidiaryMaterialId" column="subsidiary_material_id" />
<result property="finishProductCode" column="finish_product_code" />
<result property="versionNumber" column="version_number" />
<result property="subsidiaryMaterialCode" column="subsidiary_material_code" />
<result property="subsidiaryMaterialName" column="subsidiary_material_name" />
<result property="specificationModel" column="specification_model" />
<result property="inventoryUnit" column="inventory_unit" />
<result property="subsidiaryMaterialConsumption" column="subsidiary_material_consumption" />
<result property="subsidiaryMaterialLoss" column="subsidiary_material_loss" />
<result property="supplierNumber" column="supplier_number" />
<result property="finishedProductQuantity" column="finished_product_quantity" />
<result property="remarks" column="remarks" />
<result property="processingCategory" column="processing_category" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
</resultMap>
<sql id="selectSysBomSubsidiaryMaterialVo">
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
</sql>
<select id="selectSysBomSubsidiaryMaterialList" parameterType="SysBomSubsidiaryMaterial" resultMap="SysBomSubsidiaryMaterialResult">
<include refid="selectSysBomSubsidiaryMaterialVo"/>
<where>
<if test="finishProductCode != null and finishProductCode != ''"> and finish_product_code = #{finishProductCode}</if>
<if test="subsidiaryMaterialCode != null and subsidiaryMaterialCode != ''"> and subsidiary_material_code = #{subsidiaryMaterialCode}</if>
<if test="subsidiaryMaterialName != null and subsidiaryMaterialName != ''"> and subsidiary_material_name like concat('%', #{subsidiaryMaterialName}, '%')</if>
</where>
</select>
<select id="selectSysBomSubsidiaryMaterialById" parameterType="Long" resultMap="SysBomSubsidiaryMaterialResult">
<include refid="selectSysBomSubsidiaryMaterialVo"/>
where subsidiary_material_id = #{subsidiaryMaterialId}
</select>
<select id="selectfinishProductCodeByCode" parameterType="String" resultMap="SysBomSubsidiaryMaterialResult">
<include refid="selectSysBomSubsidiaryMaterialVo"/>
where finish_product_code = #{finishProductCode}
</select>
<insert id="insertSysBomSubsidiaryMaterial" parameterType="SysBomSubsidiaryMaterial">
insert into sys_bom_subsidiary_material
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="subsidiaryMaterialId != null">subsidiary_material_id,</if>
<if test="finishProductCode != null and finishProductCode != ''">finish_product_code,</if>
<if test="versionNumber != null and versionNumber != ''">version_number,</if>
<if test="subsidiaryMaterialCode != null">subsidiary_material_code,</if>
<if test="subsidiaryMaterialName != null">subsidiary_material_name,</if>
<if test="specificationModel != null">specification_model,</if>
<if test="inventoryUnit != null">inventory_unit,</if>
<if test="subsidiaryMaterialConsumption != null">subsidiary_material_consumption,</if>
<if test="subsidiaryMaterialLoss != null">subsidiary_material_loss,</if>
<if test="supplierNumber != null">supplier_number,</if>
<if test="finishedProductQuantity != null">finished_product_quantity,</if>
<if test="remarks != null">remarks,</if>
<if test="processingCategory != null">processing_category,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="subsidiaryMaterialId != null">#{subsidiaryMaterialId},</if>
<if test="finishProductCode != null and finishProductCode != ''">#{finishProductCode},</if>
<if test="versionNumber != null and versionNumber != ''">#{versionNumber},</if>
<if test="subsidiaryMaterialCode != null">#{subsidiaryMaterialCode},</if>
<if test="subsidiaryMaterialName != null">#{subsidiaryMaterialName},</if>
<if test="specificationModel != null">#{specificationModel},</if>
<if test="inventoryUnit != null">#{inventoryUnit},</if>
<if test="subsidiaryMaterialConsumption != null">#{subsidiaryMaterialConsumption},</if>
<if test="subsidiaryMaterialLoss != null">#{subsidiaryMaterialLoss},</if>
<if test="supplierNumber != null">#{supplierNumber},</if>
<if test="finishedProductQuantity != null">#{finishedProductQuantity},</if>
<if test="remarks != null">#{remarks},</if>
<if test="processingCategory != null">#{processingCategory},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
</trim>
</insert>
<update id="updateSysBomSubsidiaryMaterial" parameterType="SysBomSubsidiaryMaterial">
update sys_bom_subsidiary_material
<trim prefix="SET" suffixOverrides=",">
<if test="finishProductCode != null and finishProductCode != ''">finish_product_code = #{finishProductCode},</if>
<if test="versionNumber != null and versionNumber != ''">version_number = #{versionNumber},</if>
<if test="subsidiaryMaterialCode != null">subsidiary_material_code = #{subsidiaryMaterialCode},</if>
<if test="subsidiaryMaterialName != null">subsidiary_material_name = #{subsidiaryMaterialName},</if>
<if test="specificationModel != null">specification_model = #{specificationModel},</if>
<if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
<if test="subsidiaryMaterialConsumption != null">subsidiary_material_consumption = #{subsidiaryMaterialConsumption},</if>
<if test="subsidiaryMaterialLoss != null">subsidiary_material_loss = #{subsidiaryMaterialLoss},</if>
<if test="supplierNumber != null">supplier_number = #{supplierNumber},</if>
<if test="finishedProductQuantity != null">finished_product_quantity = #{finishedProductQuantity},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="processingCategory != null">processing_category = #{processingCategory},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
</trim>
where subsidiary_material_id = #{subsidiaryMaterialId}
</update>
<delete id="deleteSysBomSubsidiaryMaterialById" parameterType="Long">
delete from sys_bom_subsidiary_material where subsidiary_material_id = #{subsidiaryMaterialId}
</delete>
<delete id="deleteSysBomSubsidiaryMaterialByIds" parameterType="String">
delete from sys_bom_subsidiary_material where subsidiary_material_id in
<foreach item="subsidiaryMaterialId" collection="array" open="(" separator="," close=")">
#{subsidiaryMaterialId}
</foreach>
</delete>
<delete id="deleteFinishProductCode" parameterType="String">
delete from sys_bom_subsidiary_material where finish_product_code = #{finishProductCode}
</delete>
</mapper>

211
ruoyi-admin/src/main/resources/mapper/system/SysSubsidiaryMaterialMapper.xml

@ -1,211 +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.system.mapper.SysSubsidiaryMaterialMapper">
<resultMap type="SysSubsidiaryMaterial" id="SysSubsidiaryMaterialResult">
<result property="subsidiaryMaterialId" column="subsidiary_material_id" />
<result property="subsidiaryMaterialCode" column="subsidiary_material_code" />
<result property="hsNumber" column="hs_number" />
<result property="subsidiaryMaterialName" column="subsidiary_material_name" />
<result property="stockUnitWeight" column="stock_unit_weight" />
<result property="specificationModel" column="specification_model" />
<result property="inventoryUnit" column="inventory_unit" />
<result property="dedicatedWhether" column="dedicated_whether" />
<result property="customsName" column="customs_name" />
<result property="safetyStock" column="safety_stock" />
<result property="remarks" column="remarks" />
<result property="specialUse" column="special_use" />
<result property="whetherStop" column="whether_stop" />
<result property="supplierNumber" column="supplier_number" />
<result property="limitCollectionAmount" column="limit_collection_amount" />
<result property="subsidiaryMaterialCategory" column="subsidiary_material_category" />
<result property="defaultWarehouse" column="default_warehouse" />
<result property="warehouseLocation" column="warehouse_location" />
<result property="purchasePrice" column="purchase_price" />
<result property="purchaseLeadTime" column="purchase_lead_time" />
<result property="minimumBatchSize" column="minimum_batch_size" />
<result property="supplierCode" column="supplier_code" />
<result property="supplierName" column="supplier_name" />
<result property="limitWhether" column="limit_whether" />
<result property="maximumPurchaseQuantity" column="maximum_purchase_quantity" />
<result property="costPrice" column="cost_price" />
<result property="primarySupplier" column="primary_supplier" />
<result property="subSupplier" column="sub_supplier" />
<result property="maximumInventory" column="maximum_inventory" />
<result property="detentionDays" column="detention_days" />
<result property="gpItemSelection" column="gp_Item_selection" />
<result property="exportSales" column="export_sales" />
<result property="createrName" column="creater_name" />
<result property="materialCategory" column="material_category" />
<result property="kesNumber" column="kes_number" />
<result property="typeMachine" column="type_machine" />
<result property="firstAddTime" column="first_add_time" />
<result property="updateInfoTime" column="update_info_time" />
<result property="createrTime" column="creater_time" />
</resultMap>
<sql id="selectSysSubsidiaryMaterialVo">
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
</sql>
<select id="selectSysSubsidiaryMaterialList" parameterType="SysSubsidiaryMaterial" resultMap="SysSubsidiaryMaterialResult">
<include refid="selectSysSubsidiaryMaterialVo"/>
<where>
<if test="subsidiaryMaterialCode != null and subsidiaryMaterialCode != ''"> and subsidiary_material_code like concat('%', #{subsidiaryMaterialCode}, '%')</if>
<if test="subsidiaryMaterialName != null and subsidiaryMaterialName != ''"> and subsidiary_material_name like concat('%', #{subsidiaryMaterialName}, '%')</if>
<if test="whetherStop != null and whetherStop != ''"> and whether_stop like concat('%', #{whetherStop}, '%')</if>
<if test="supplierNumber != null and supplierNumber != ''"> and supplier_number = #{supplierNumber}</if>
<if test="primarySupplier != null and primarySupplier != ''"> and primary_supplier like concat('%', #{primarySupplier}, '%')</if>
</where>
</select>
<select id="selectSysSubsidiaryMaterialById" parameterType="Long" resultMap="SysSubsidiaryMaterialResult">
<include refid="selectSysSubsidiaryMaterialVo"/>
where subsidiary_material_id = #{subsidiaryMaterialId}
</select>
<select id="selectSysSubsidiaryMaterialByCode" parameterType="String" resultMap="SysSubsidiaryMaterialResult">
<include refid="selectSysSubsidiaryMaterialVo"/>
where subsidiary_material_code = #{subsidiaryMaterialCode}
</select>
<insert id="insertSysSubsidiaryMaterial" parameterType="SysSubsidiaryMaterial" useGeneratedKeys="true" keyProperty="subsidiaryMaterialId">
insert into sys_subsidiary_material
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="subsidiaryMaterialCode != null">subsidiary_material_code,</if>
<if test="hsNumber != null">hs_number,</if>
<if test="subsidiaryMaterialName != null">subsidiary_material_name,</if>
<if test="stockUnitWeight != null">stock_unit_weight,</if>
<if test="specificationModel != null">specification_model,</if>
<if test="inventoryUnit != null">inventory_unit,</if>
<if test="dedicatedWhether != null">dedicated_whether,</if>
<if test="customsName != null">customs_name,</if>
<if test="safetyStock != null">safety_stock,</if>
<if test="remarks != null">remarks,</if>
<if test="specialUse != null">special_use,</if>
<if test="whetherStop != null">whether_stop,</if>
<if test="supplierNumber != null">supplier_number,</if>
<if test="limitCollectionAmount != null">limit_collection_amount,</if>
<if test="subsidiaryMaterialCategory != null">subsidiary_material_category,</if>
<if test="defaultWarehouse != null">default_warehouse,</if>
<if test="warehouseLocation != null">warehouse_location,</if>
<if test="purchasePrice != null">purchase_price,</if>
<if test="purchaseLeadTime != null">purchase_lead_time,</if>
<if test="minimumBatchSize != null">minimum_batch_size,</if>
<if test="supplierCode != null">supplier_code,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="limitWhether != null">limit_whether,</if>
<if test="maximumPurchaseQuantity != null">maximum_purchase_quantity,</if>
<if test="costPrice != null">cost_price,</if>
<if test="primarySupplier != null">primary_supplier,</if>
<if test="subSupplier != null">sub_supplier,</if>
<if test="maximumInventory != null">maximum_inventory,</if>
<if test="detentionDays != null">detention_days,</if>
<if test="gpItemSelection != null">gp_Item_selection,</if>
<if test="exportSales != null">export_sales,</if>
<if test="createrName != null">creater_name,</if>
<if test="materialCategory != null">material_category,</if>
<if test="kesNumber != null">kes_number,</if>
<if test="typeMachine != null">type_machine,</if>
<if test="createrTime != null">creater_time,</if>
first_add_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="subsidiaryMaterialCode != null">#{subsidiaryMaterialCode},</if>
<if test="hsNumber != null">#{hsNumber},</if>
<if test="subsidiaryMaterialName != null">#{subsidiaryMaterialName},</if>
<if test="stockUnitWeight != null">#{stockUnitWeight},</if>
<if test="specificationModel != null">#{specificationModel},</if>
<if test="inventoryUnit != null">#{inventoryUnit},</if>
<if test="dedicatedWhether != null">#{dedicatedWhether},</if>
<if test="customsName != null">#{customsName},</if>
<if test="safetyStock != null">#{safetyStock},</if>
<if test="remarks != null">#{remarks},</if>
<if test="specialUse != null">#{specialUse},</if>
<if test="whetherStop != null">#{whetherStop},</if>
<if test="supplierNumber != null">#{supplierNumber},</if>
<if test="limitCollectionAmount != null">#{limitCollectionAmount},</if>
<if test="subsidiaryMaterialCategory != null">#{subsidiaryMaterialCategory},</if>
<if test="defaultWarehouse != null">#{defaultWarehouse},</if>
<if test="warehouseLocation != null">#{warehouseLocation},</if>
<if test="purchasePrice != null">#{purchasePrice},</if>
<if test="purchaseLeadTime != null">#{purchaseLeadTime},</if>
<if test="minimumBatchSize != null">#{minimumBatchSize},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="limitWhether != null">#{limitWhether},</if>
<if test="maximumPurchaseQuantity != null">#{maximumPurchaseQuantity},</if>
<if test="costPrice != null">#{costPrice},</if>
<if test="primarySupplier != null">#{primarySupplier},</if>
<if test="subSupplier != null">#{subSupplier},</if>
<if test="maximumInventory != null">#{maximumInventory},</if>
<if test="detentionDays != null">#{detentionDays},</if>
<if test="gpItemSelection != null">#{gpItemSelection},</if>
<if test="exportSales != null">#{exportSales},</if>
<if test="createrName != null">#{createrName},</if>
<if test="materialCategory != null">#{materialCategory},</if>
<if test="kesNumber != null">#{kesNumber},</if>
<if test="typeMachine != null">#{typeMachine},</if>
<if test="createrTime != null">#{createrTime},</if>
now(),
</trim>
</insert>
<update id="updateSysSubsidiaryMaterial" parameterType="SysSubsidiaryMaterial">
update sys_subsidiary_material
<trim prefix="SET" suffixOverrides=",">
<if test="subsidiaryMaterialCode != null">subsidiary_material_code = #{subsidiaryMaterialCode},</if>
<if test="hsNumber != null">hs_number = #{hsNumber},</if>
<if test="subsidiaryMaterialName != null">subsidiary_material_name = #{subsidiaryMaterialName},</if>
<if test="stockUnitWeight != null">stock_unit_weight = #{stockUnitWeight},</if>
<if test="specificationModel != null">specification_model = #{specificationModel},</if>
<if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
<if test="dedicatedWhether != null">dedicated_whether = #{dedicatedWhether},</if>
<if test="customsName != null">customs_name = #{customsName},</if>
<if test="safetyStock != null">safety_stock = #{safetyStock},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="specialUse != null">special_use = #{specialUse},</if>
<if test="whetherStop != null">whether_stop = #{whetherStop},</if>
<if test="supplierNumber != null">supplier_number = #{supplierNumber},</if>
<if test="limitCollectionAmount != null">limit_collection_amount = #{limitCollectionAmount},</if>
<if test="subsidiaryMaterialCategory != null">subsidiary_material_category = #{subsidiaryMaterialCategory},</if>
<if test="defaultWarehouse != null">default_warehouse = #{defaultWarehouse},</if>
<if test="warehouseLocation != null">warehouse_location = #{warehouseLocation},</if>
<if test="purchasePrice != null">purchase_price = #{purchasePrice},</if>
<if test="purchaseLeadTime != null">purchase_lead_time = #{purchaseLeadTime},</if>
<if test="minimumBatchSize != null">minimum_batch_size = #{minimumBatchSize},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="limitWhether != null">limit_whether = #{limitWhether},</if>
<if test="maximumPurchaseQuantity != null">maximum_purchase_quantity = #{maximumPurchaseQuantity},</if>
<if test="costPrice != null">cost_price = #{costPrice},</if>
<if test="primarySupplier != null">primary_supplier = #{primarySupplier},</if>
<if test="subSupplier != null">sub_supplier = #{subSupplier},</if>
<if test="maximumInventory != null">maximum_inventory = #{maximumInventory},</if>
<if test="detentionDays != null">detention_days = #{detentionDays},</if>
<if test="gpItemSelection != null">gp_Item_selection = #{gpItemSelection},</if>
<if test="exportSales != null">export_sales = #{exportSales},</if>
<if test="createrName != null">creater_name = #{createrName},</if>
<if test="materialCategory != null">material_category = #{materialCategory},</if>
<if test="kesNumber != null">kes_number = #{kesNumber},</if>
<if test="typeMachine != null">type_machine = #{typeMachine},</if>
<if test="createrTime != null">creater_time = #{createrTime},</if>
update_info_time = CONCAT_WS(',',NOW(),update_info_time),
</trim>
where subsidiary_material_id = #{subsidiaryMaterialId}
</update>
<delete id="deleteSysSubsidiaryMaterialById" parameterType="Long">
delete from sys_subsidiary_material where subsidiary_material_id = #{subsidiaryMaterialId}
</delete>
<delete id="deleteSysSubsidiaryMaterialByIds" parameterType="String">
delete from sys_subsidiary_material where subsidiary_material_id in
<foreach item="subsidiaryMaterialId" collection="array" open="(" separator="," close=")">
#{subsidiaryMaterialId}
</foreach>
</delete>
</mapper>

103
ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/add.html

@ -1,103 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增bom辅料')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-bomsubsidiarymaterial-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">成品代码:</label>
<div class="col-sm-8">
<input name="finishProductCode" 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="subsidiaryMaterialCode" 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="subsidiaryMaterialName" 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="specificationModel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<input name="inventoryUnit" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用量:</label>
<div class="col-sm-8">
<input name="subsidiaryMaterialConsumption" 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="subsidiaryMaterialLoss" 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="supplierNumber" 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="finishedProductQuantity" 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="remarks" 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="processingCategory" 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="standbyOne" 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="standbyTwo" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/bomsubsidiarymaterial"
$("#form-bomsubsidiarymaterial-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-bomsubsidiarymaterial-add').serialize());
}
}
</script>
</body>
</html>

142
ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/bomsubsidiarymaterial.html

@ -1,142 +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('bom辅料列表')" />
</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="finishProductCode"/>
</li>
<li>
<label>辅料代码:</label>
<input type="text" name="subsidiaryMaterialCode"/>
</li>
<li>
<label>辅料名称:</label>
<input type="text" name="subsidiaryMaterialName"/>
</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="system:bomsubsidiarymaterial:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:bomsubsidiarymaterial:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:bomsubsidiarymaterial:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:bomsubsidiarymaterial: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('system:bomsubsidiarymaterial:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:bomsubsidiarymaterial:remove')}]];
var prefix = ctx + "system/bomsubsidiarymaterial";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "bom辅料",
columns: [{
checkbox: true
},
{
field: 'subsidiaryMaterialId',
title: 'bom辅料id',
visible: false
},
{
field: 'finishProductCode',
title: '成品代码'
},
{
field: 'subsidiaryMaterialCode',
title: '辅料代码'
},
{
field: 'subsidiaryMaterialName',
title: '辅料名称'
},
{
field: 'specificationModel',
title: '规格型号'
},
{
field: 'inventoryUnit',
title: '单位'
},
{
field: 'subsidiaryMaterialConsumption',
title: '用量'
},
{
field: 'subsidiaryMaterialLoss',
title: '损耗%'
},
{
field: 'supplierNumber',
title: '厂商料号'
},
{
field: 'finishedProductQuantity',
title: '成品数量'
},
{
field: 'remarks',
title: '备注说明'
},
{
field: 'processingCategory',
title: '加工类别'
},
{
field: 'standbyOne',
title: '备用一'
},
{
field: 'standbyTwo',
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.subsidiaryMaterialId + '\')"><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.subsidiaryMaterialId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

104
ruoyi-admin/src/main/resources/templates/system/bomsubsidiarymaterial/edit.html

@ -1,104 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改bom辅料')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-bomsubsidiarymaterial-edit" th:object="${sysBomSubsidiaryMaterial}">
<input name="subsidiaryMaterialId" th:field="*{subsidiaryMaterialId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">成品代码:</label>
<div class="col-sm-8">
<input name="finishProductCode" th:field="*{finishProductCode}" 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="subsidiaryMaterialCode" th:field="*{subsidiaryMaterialCode}" 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="subsidiaryMaterialName" th:field="*{subsidiaryMaterialName}" 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="specificationModel" th:field="*{specificationModel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<input name="inventoryUnit" th:field="*{inventoryUnit}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用量:</label>
<div class="col-sm-8">
<input name="subsidiaryMaterialConsumption" th:field="*{subsidiaryMaterialConsumption}" 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="subsidiaryMaterialLoss" th:field="*{subsidiaryMaterialLoss}" 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="supplierNumber" th:field="*{supplierNumber}" 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="finishedProductQuantity" th:field="*{finishedProductQuantity}" 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="remarks" th:field="*{remarks}" 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="processingCategory" th:field="*{processingCategory}" 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="standbyOne" th:field="*{standbyOne}" 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="standbyTwo" th:field="*{standbyTwo}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/bomsubsidiarymaterial";
$("#form-bomsubsidiarymaterial-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-bomsubsidiarymaterial-edit').serialize());
}
}
</script>
</body>
</html>

383
ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/add.html

@ -1,383 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增辅料资料')" />
<th:block th:include="include :: datetimepicker-css" />
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-subsidiarymaterial-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">辅料代码:</label>
<div class="col-sm-8">
<input name="subsidiaryMaterialCode" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">辅料名称:</label>
<div class="col-sm-8">
<input name="subsidiaryMaterialName" 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="specificationModel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">海关HS号:</label>
<div class="col-sm-8">
<input name="hsNumber" 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="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位重量:</label>
<div class="col-sm-8">
<input name="stockUnitWeight" 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="inventoryUnit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">默认仓库:</label>
<div class="col-sm-8">
<select name="defaultWarehouse" class="form-control m-b">
<option value="">请选择默认仓库</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">辅料类别:</label>
<div class="col-sm-8">
<select name="subsidiaryMaterialCategory" class="form-control m-b" th:with="type=${@dict.getType('sys_subsidiary_material_category')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">限额领用数:</label>
<div class="col-sm-8">
<input name="limitCollectionAmount" 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="warehouseLocation" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">机种:</label>
<div class="col-sm-8">
<input name="typeMachine" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">供应商料号:</label>
<div class="col-sm-8">
<input name="supplierNumber" 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 id="supplierCode" name="supplierCode" class="form-control m-b">
<option value="">请选择供应商代码</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">供应商名称:</label>
<div class="col-sm-8">
<select id="supplierName" name="supplierName" class="form-control m-b" >
<option value="">请选择供应商</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否专用:</label>
<div class="col-sm-8">
<select name="dedicatedWhether" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">限额领用否:</label>
<div class="col-sm-8">
<select name="limitWhether" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">海关名称:</label>
<div class="col-sm-8">
<input name="customsName" 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="safetyStock" 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="purchasePrice" 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="purchaseLeadTime" 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="minimumBatchSize" 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="maximumPurchaseQuantity" 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="costPrice" 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 id="primarySupplier" name="primarySupplier" class="form-control m-b">
<option value="">请选择主供应商</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">次供应商:</label>
<div class="col-sm-8">
<select id="subSupplier" name="subSupplier" class="form-control m-b">
<option value="">请选择次供应商</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">最高库存:</label>
<div class="col-sm-8">
<input name="maximumInventory" 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="detentionDays" 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="specialUse" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">GP项选择:</label>
<div class="col-sm-8">
<select name="gpItemSelection" class="form-control m-b" th:with="type=${@dict.getType('sys_gp_Item_selection')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注说明:</label>
<div class="col-sm-8">
<textarea name="remarks" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号是否停用:</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_whether')}">
<input type="radio" th:id="${'whetherStop_' + dict.dictCode}" name="whetherStop" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'whetherStop_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">创建人:</label>
<div class="col-sm-8">
<input name="createrName" 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="materialCategory" class="form-control m-b" th:with="type=${@dict.getType('sys_material_category')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">科恩仕料号:</label>
<div class="col-sm-8">
<input name="kesNumber" 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="standbyOne" 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="standbyTwo" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">创建时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="createrTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js"/>
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var supplierdata=[]
var prefix = ctx + "system/subsidiarymaterial"
$("#form-subsidiarymaterial-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-subsidiarymaterial-add').serialize());
}
}
$("input[name='createrTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
// 供应商信息
$.ajax({
url: ctx + "system/supplier/list",
type: "POST",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
supplierdata = res.rows;
//alert(JSON.stringify(data));
console.log(res.rows)
for (let i in supplierdata) {
$("select[name='supplierCode']").append("<option value='" + supplierdata[i].supplierCode + "'>" + supplierdata[i].supplierCode + "</option>");
$("select[name='supplierName']").append("<option value='" + supplierdata[i].supplierName + "'>" + supplierdata[i].supplierName + "</option>");
$("select[name='primarySupplier']").append("<option value='" + supplierdata[i].supplierName + "'>" + supplierdata[i].supplierName + "</option>");
$("select[name='subSupplier']").append("<option value='" + supplierdata[i].supplierName + "'>" + supplierdata[i].supplierName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
})
// 根据供应商代码改变
$("select[name='supplierCode']").change(function () {
var supplierCode = $(this).val();
for (i = 0; i < supplierdata.length; i++) {
if (supplierdata[i].supplierCode == supplierCode) {
$("select[name='supplierName']").val(supplierdata[i].supplierName).trigger("change")
}
}
})
//仓库信息
$.ajax({
url: ctx + "stock/stockInfo/list",
type: "POST",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
stockInfodata = res.rows;
//alert(JSON.stringify(data));
console.log(res.rows)
for (let i in stockInfodata) {
$("select[name='defaultWarehouse']").append("<option value='" + stockInfodata[i].stockname + "'>" + stockInfodata[i].stockname + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
})
</script>
</body>
</html>

389
ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/edit.html

@ -1,389 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改辅料资料')" />
<th:block th:include="include :: datetimepicker-css" />
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-subsidiarymaterial-edit" th:object="${sysSubsidiaryMaterial}">
<input name="subsidiaryMaterialId" th:field="*{subsidiaryMaterialId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">辅料代码:</label>
<div class="col-sm-8">
<input name="subsidiaryMaterialCode" th:field="*{subsidiaryMaterialCode}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">辅料名称:</label>
<div class="col-sm-8">
<input name="subsidiaryMaterialName" th:field="*{subsidiaryMaterialName}" 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">
<select name="subsidiaryMaterialCategory" class="form-control m-b" th:with="type=${@dict.getType('sys_subsidiary_material_category')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{subsidiaryMaterialCategory}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">默认仓库:</label>
<div class="col-sm-8">
<select name="defaultWarehouse" class="form-control m-b">
<option value="">请选择默认仓库</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">库存单位:</label>
<div class="col-sm-8">
<select name="inventoryUnit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{inventoryUnit}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">规格型号:</label>
<div class="col-sm-8">
<input name="specificationModel" th:field="*{specificationModel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">库位:</label>
<div class="col-sm-8">
<input name="warehouseLocation" th:field="*{warehouseLocation}" 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="stockUnitWeight" th:field="*{stockUnitWeight}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">海关HS号:</label>
<div class="col-sm-8">
<input name="hsNumber" th:field="*{hsNumber}" 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="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{exportSales}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">机种:</label>
<div class="col-sm-8">
<input name="typeMachine" th:field="*{typeMachine}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">限额领用数:</label>
<div class="col-sm-8">
<input name="limitCollectionAmount" th:field="*{limitCollectionAmount}" 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="supplierNumber" th:field="*{supplierNumber}" 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="supplierCode" class="form-control m-b">
<option value="">请选择供应商代码</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">供应商名称:</label>
<div class="col-sm-8">
<select name="supplierName" class="form-control m-b">
<option value="">请选择供应商</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否专用:</label>
<div class="col-sm-8">
<select name="dedicatedWhether" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{dedicatedWhether}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">海关名称:</label>
<div class="col-sm-8">
<input name="customsName" th:field="*{customsName}" 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="safetyStock" th:field="*{safetyStock}" 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="specialUse" th:field="*{specialUse}" 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="purchasePrice" th:field="*{purchasePrice}" 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="purchaseLeadTime" th:field="*{purchaseLeadTime}" 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="minimumBatchSize" th:field="*{minimumBatchSize}" 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="limitWhether" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{limitWhether}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">最大采购量:</label>
<div class="col-sm-8">
<input name="maximumPurchaseQuantity" th:field="*{maximumPurchaseQuantity}" 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="costPrice" th:field="*{costPrice}" 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="primarySupplier" class="form-control m-b">
<option value="">请选择主供应商</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">次供应商:</label>
<div class="col-sm-8">
<select name="subSupplier" class="form-control m-b">
<option value="">请选择次供应商</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">最高库存:</label>
<div class="col-sm-8">
<input name="maximumInventory" th:field="*{maximumInventory}" 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="detentionDays" th:field="*{detentionDays}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">GP项选择:</label>
<div class="col-sm-8">
<select name="gpItemSelection" class="form-control m-b" th:with="type=${@dict.getType('sys_gp_Item_selection')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{gpItemSelection}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注说明:</label>
<div class="col-sm-8">
<textarea name="remarks" class="form-control">[[*{remarks}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号是否停用:</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_whether')}">
<input type="radio" th:id="${'whetherStop_' + dict.dictCode}" name="whetherStop" th:value="${dict.dictValue}" th:field="*{whetherStop}">
<label th:for="${'whetherStop_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">创建人:</label>
<div class="col-sm-8">
<input name="createrName" th:field="*{createrName}" 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="materialCategory" class="form-control m-b" th:with="type=${@dict.getType('sys_material_category')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{materialCategory}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">科恩仕料号:</label>
<div class="col-sm-8">
<input name="kesNumber" th:field="*{kesNumber}" 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="standbyOne" th:field="*{standbyOne}" 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="standbyTwo" th:field="*{standbyTwo}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">创建时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="createrTime" th:value="*{createrTime}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js"/>
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var getData = [[${sysSubsidiaryMaterial}]];
var supplierdata=[]
var prefix = ctx + "system/subsidiarymaterial";
$("#form-subsidiarymaterial-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-subsidiarymaterial-edit').serialize());
}
}
$("input[name='createrTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
// 供应商信息
$.ajax({
url: ctx + "system/supplier/list",
type: "POST",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
supplierdata = res.rows;
//alert(JSON.stringify(data));
console.log(res.rows)
for (let i in supplierdata) {
$("select[name='supplierCode']").append("<option value='" + supplierdata[i].supplierCode + "'>" + supplierdata[i].supplierCode + "</option>");
$("select[name='supplierName']").append("<option value='" + supplierdata[i].supplierName + "'>" + supplierdata[i].supplierName + "</option>");
$("select[name='primarySupplier']").append("<option value='" + supplierdata[i].supplierName + "'>" + supplierdata[i].supplierName + "</option>");
$("select[name='subSupplier']").append("<option value='" + supplierdata[i].supplierName + "'>" + supplierdata[i].supplierName + "</option>");
}
$("select[name='supplierCode']").val(getData.supplierCode).trigger("change")
$("select[name='supplierName']").val(getData.supplierName).trigger("change")
$("select[name='primarySupplier']").val(getData.primarySupplier).trigger("change")
$("select[name='subSupplier']").val(getData.subSupplier).trigger("change")
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
})
// 根据供应商代码改变
$("select[name='supplierCode']").change(function () {
var supplierCode = $(this).val();
for (i = 0; i < supplierdata.length; i++) {
if (supplierdata[i].supplierCode == supplierCode) {
$("select[name='supplierName']").val(supplierdata[i].supplierName).trigger("change")
}
}
})
//仓库信息
$.ajax({
url: ctx + "stock/stockInfo/list",
type: "POST",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
stockInfodata = res.rows;
//alert(JSON.stringify(data));
console.log(res.rows)
for (let i in stockInfodata) {
$("select[name='defaultWarehouse']").append("<option value='" + stockInfodata[i].stockname + "'>" + stockInfodata[i].stockname + "</option>");
}
$("select[name='defaultWarehouse']").val(getData.defaultWarehouse).trigger("change")
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
})
</script>
</body>
</html>

354
ruoyi-admin/src/main/resources/templates/system/subsidiarymaterial/subsidiarymaterial.html

@ -1,354 +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="subsidiaryMaterialCode"/>
</li>
<li>
<label>辅料名称:</label>
<input type="text" name="subsidiaryMaterialName"/>
</li>
<li>
<label>料号是否停用:</label>
<select name="whetherStop" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>供应商料号:</label>
<input type="text" name="supplierNumber"/>
</li>
<li>
<label>主供应商:</label>
<!-- <select name="primarySupplier">-->
<!-- <option value="">所有</option>-->
<!-- <option value="-1">代码生成请选择字典属性</option>-->
<!-- </select>-->
<input type="text" name="primarySupplier"/>
</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="system:subsidiarymaterial:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()"
shiro:hasPermission="system:subsidiarymaterial:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
shiro:hasPermission="system:subsidiarymaterial:remove">
<i class="fa fa-remove"></i> 删除
</a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()"-->
<!-- shiro:hasPermission="system:subsidiarymaterial:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" style="white-space:nowrap"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:subsidiarymaterial:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:subsidiarymaterial:remove')}]];
var inventoryUnitDatas = [[${@dict.getType('sys_unit_class')}]];
var dedicatedWhetherDatas = [[${@dict.getType('sys_whether')}]];
var whetherStopDatas = [[${@dict.getType('sys_whether')}]];
var subsidiaryMaterialCategoryDatas = [[${@dict.getType('sys_subsidiary_material_category')}]];
var limitWhetherDatas = [[${@dict.getType('sys_whether')}]];
var gpItemSelectionDatas = [[${@dict.getType('sys_gp_Item_selection')}]];
var exportSalesDatas = [[${@dict.getType('sys_export_sales')}]];
var materialCategoryDatas = [[${@dict.getType('sys_material_category')}]];
var prefix = ctx + "system/subsidiarymaterial";
$(function () {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
pageList: [10, 25, 50, "all"],
clickToSelect: true,
modalName: "辅料资料",
columns: [{
checkbox: true
},
{
field: 'subsidiaryMaterialId',
title: '辅料id',
visible: false
},
{
field: 'subsidiaryMaterialCode',
title: '辅料代码'
},
{
field: 'subsidiaryMaterialName',
title: '辅料名称'
},
{
field: 'specificationModel',
title: '规格型号'
},
{
field: 'hsNumber',
title: '海关HS号',
visible: false
},
{
field: 'stockUnitWeight',
title: '单位重量',
},
{
field: 'inventoryUnit',
title: '库存单位',
formatter: function (value, row, index) {
return $.table.selectDictLabel(inventoryUnitDatas, value);
},
},
{
field: 'customsName',
title: '海关名称',
visible: false
},
{
field: 'defaultWarehouse',
title: '默认仓库',
},
{
field: 'safetyStock',
title: '安全库存',
},
{
field: 'maximumInventory',
title: '最高库存',
},
{
field: 'specialUse',
title: '专用部门或人',
visible: false
},
{
field: 'supplierNumber',
title: '供应商料号'
},
{
field: 'limitCollectionAmount',
title: '限额领用数',
visible: false
},
{
field: 'subsidiaryMaterialCategory',
title: '辅料类别',
formatter: function (value, row, index) {
return $.table.selectDictLabel(subsidiaryMaterialCategoryDatas, value);
},
visible: false
},
{
field: 'warehouseLocation',
title: '库位',
},
{
field: 'purchasePrice',
title: '采购价格',
visible: false
},
{
field: 'purchaseLeadTime',
title: '采购提前期',
visible: false
},
{
field: 'minimumBatchSize',
title: '最小批量',
visible: false
},
{
field: 'supplierCode',
title: '供应商代码'
},
{
field: 'supplierName',
title: '供应商名称'
},
{
field: 'limitWhether',
title: '限额领用否',
formatter: function (value, row, index) {
return $.table.selectDictLabel(limitWhetherDatas, value);
},
visible: false
},
{
field: 'dedicatedWhether',
title: '是否专用',
formatter: function (value, row, index) {
return $.table.selectDictLabel(dedicatedWhetherDatas, value);
},
visible: false
},
{
field: 'maximumPurchaseQuantity',
title: '最大采购量',
visible: false
},
{
field: 'costPrice',
title: '成本价',
visible: false
},
{
field: 'primarySupplier',
title: '主供应商'
},
{
field: 'subSupplier',
title: '次供应商',
visible: false
},
{
field: 'detentionDays',
title: '滞留天数'
},
{
field: 'gpItemSelection',
title: 'GP项选择',
formatter: function (value, row, index) {
return $.table.selectDictLabel(gpItemSelectionDatas, value);
},
visible: false
},
{
field: 'exportSales',
title: '内外销',
formatter: function (value, row, index) {
return $.table.selectDictLabel(exportSalesDatas, value);
}
},
{
field: 'whetherStop',
title: '料号是否停用',
formatter: function (value, row, index) {
return $.table.selectDictLabel(whetherStopDatas, value);
}
},
{
field: 'remarks',
title: '备注说明',
visible: false
},
{
field: 'createrName',
title: '创建人'
},
{
field: 'materialCategory',
title: '类别',
formatter: function (value, row, index) {
return $.table.selectDictLabel(materialCategoryDatas, value);
}
},
{
field: 'kesNumber',
title: '科恩仕料号'
},
{
field: 'typeMachine',
title: '机种'
},
{
field: 'standbyOne',
title: '备用一',
visible: false
},
{
field: 'standbyTwo',
title: '备用二',
visible: false
},
{
field: 'createrTime',
title: '创建时间',
visible: false
},
{
field: 'firstAddTime',
title: '录入时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
return value;
}
}
},
{
field: 'updateInfoTime',
title: '上次修改时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
var vArr = value.split(',')
return vArr[0];
}
}
}
// {
// 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.subsidiaryMaterialId + '\')"><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.subsidiaryMaterialId + '\')"><i class="fa fa-remove"></i>删除</a>');
// return actions.join('');
// }
// }
]
};
$.table.init(options);
});
</script>
</body>
</html>
Loading…
Cancel
Save