From f2cc6fe8b912281b48cd99868dc5f0d7555f52e4 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Mon, 4 Dec 2023 14:23:21 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=80=E6=9C=AF=E5=9B=A2=E9=98=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/ErpMaterialController.java | 44 ++-- .../domain/SysErpMaterialProductItem.java | 13 ++ .../ruoyi/system/domain/SysProductItem.java | 209 ++++++++++++++++++ .../SysErpMaterialProductItemMapper.java | 13 ++ .../system/mapper/SysProductItemMapper.java | 78 +++++++ .../service/ISysProductItemService.java | 76 +++++++ .../SysErpMaterialProductItemService.java | 14 ++ .../SysErpMaterialProductItemServiceIpml.java | 37 ++++ .../impl/SysProductItemServiceImpl.java | 127 +++++++++++ .../SysErpMaterialProductItemMapper.xml | 49 ++++ .../mapper/system/SysProductItemMapper.xml | 137 ++++++++++++ .../main/resources/templates/erp/bom/bom.html | 8 +- .../resources/templates/erp/material/add.html | 30 ++- .../templates/erp/material/detail.html | 34 +-- .../templates/erp/material/edit.html | 51 ++++- .../templates/erp/material/material.html | 8 + .../resources/templates/system/item/add.html | 97 ++++++++ 17 files changed, 984 insertions(+), 41 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysErpMaterialProductItem.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysErpMaterialProductItemMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductItemMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/SysErpMaterialProductItemService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysErpMaterialProductItemServiceIpml.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysErpMaterialProductItemMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/system/item/add.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java index 9413df25..1ca98504 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java @@ -1,25 +1,21 @@ package com.ruoyi.erp.controller; -import java.util.List; - -import com.ruoyi.common.core.domain.entity.SysUser; -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.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.erp.domain.ErpMaterial; -import com.ruoyi.erp.service.IErpMaterialService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.erp.domain.ErpMaterial; +import com.ruoyi.erp.service.IErpMaterialService; +import com.ruoyi.system.service.ISysProductItemService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 物料信息Controller @@ -32,6 +28,8 @@ import com.ruoyi.common.core.page.TableDataInfo; public class ErpMaterialController extends BaseController { private String prefix = "erp/material"; + @Autowired + private ISysProductItemService sysProductItemService; @Autowired private IErpMaterialService erpMaterialService; @@ -167,4 +165,18 @@ public class ErpMaterialController extends BaseController { return prefix + "/select"; } + + + /** + * 审核信息 + * + */ + @RequiresPermissions("erp:material:item") + @Log(title = "物料信息", businessType = BusinessType.RESTORE) + @PostMapping( "/material") + @ResponseBody + public String materialProductItemList(ErpMaterial erpMaterial){ + startPage(); + return ""; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysErpMaterialProductItem.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysErpMaterialProductItem.java new file mode 100644 index 00000000..4f2ccfc5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysErpMaterialProductItem.java @@ -0,0 +1,13 @@ +package com.ruoyi.system.domain; + +/** + * 物料信息表与技术团体配置信息关联表 + */ +public class SysErpMaterialProductItem { + // 关联表id + private Long iconId; + //物料信息Id + private Long materialId; + //技术团队id + private Long productItemId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java new file mode 100644 index 00000000..28b1dd81 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java @@ -0,0 +1,209 @@ +package com.ruoyi.system.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 生产团队对象 sys_product_item + * + * @author ruoyi + * @date 2023-12-04 + */ +public class SysProductItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 生产团队的id */ + @Excel(name = "生产团队的id") + private Long id; + + /** 生产团队类型 */ + @Excel(name = "生产团队类型") + private String types; + + /** 生产团队成员 */ + @Excel(name = "生产团队成员") + private String productItem; + + /** 删除标志 0正常 1删除 */ + private String delFlag; + + /** 职能 */ + @Excel(name = "职能") + private String functions; + + /** 电气技术人员 */ + @Excel(name = "电气技术人员") + private String dianqi; + + /** 结构技术人员 */ + @Excel(name = "结构技术人员") + private String struct; + + /** 软件技术人员 */ + @Excel(name = "软件技术人员") + private String soft; + + /** 测试技术人员 */ + @Excel(name = "测试技术人员") + private String test; + + /** 主管1 */ + @Excel(name = "主管1") + private String zhuguan1; + + /** 主管2 */ + @Excel(name = "主管2") + private String zhuguan2; + + /** 经理 */ + @Excel(name = "经理") + private String manger; + + /** 总监 */ + @Excel(name = "总监") + private String director; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setTypes(String types) + { + this.types = types; + } + + public String getTypes() + { + return types; + } + public void setProductItem(String productItem) + { + this.productItem = productItem; + } + + public String getProductItem() + { + return productItem; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setFunctions(String functions) + { + this.functions = functions; + } + + public String getFunctions() + { + return functions; + } + public void setDianqi(String dianqi) + { + this.dianqi = dianqi; + } + + public String getDianqi() + { + return dianqi; + } + public void setStruct(String struct) + { + this.struct = struct; + } + + public String getStruct() + { + return struct; + } + public void setSoft(String soft) + { + this.soft = soft; + } + + public String getSoft() + { + return soft; + } + public void setTest(String test) + { + this.test = test; + } + + public String getTest() + { + return test; + } + public void setZhuguan1(String zhuguan1) + { + this.zhuguan1 = zhuguan1; + } + + public String getZhuguan1() + { + return zhuguan1; + } + public void setZhuguan2(String zhuguan2) + { + this.zhuguan2 = zhuguan2; + } + + public String getZhuguan2() + { + return zhuguan2; + } + public void setManger(String manger) + { + this.manger = manger; + } + + public String getManger() + { + return manger; + } + public void setDirector(String director) + { + this.director = director; + } + + public String getDirector() + { + return director; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("types", getTypes()) + .append("productItem", getProductItem()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .append("functions", getFunctions()) + .append("dianqi", getDianqi()) + .append("struct", getStruct()) + .append("soft", getSoft()) + .append("test", getTest()) + .append("zhuguan1", getZhuguan1()) + .append("zhuguan2", getZhuguan2()) + .append("manger", getManger()) + .append("director", getDirector()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysErpMaterialProductItemMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysErpMaterialProductItemMapper.java new file mode 100644 index 00000000..cc2da02a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysErpMaterialProductItemMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.SysErpMaterialProductItem; + +import java.util.List; + +public interface SysErpMaterialProductItemMapper { + List selectSysMaterialProductItemList(SysErpMaterialProductItem sysErpMaterialProductItem); + SysErpMaterialProductItem selectSysMaterialProductItemListById(Long iconId); + Integer insertSysErpMaterialProductItem(SysErpMaterialProductItem sysErpMaterialProductItem); + Integer deleteSysErpMaterialProductItem(List list); + Integer updateSysErpMaterialProductItem(SysErpMaterialProductItem sysErpMaterialProductItem); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductItemMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductItemMapper.java new file mode 100644 index 00000000..9605a554 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductItemMapper.java @@ -0,0 +1,78 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.SysProductItem; + +import java.util.List; + +/** + * 生产团队Mapper接口 + * + * @author ruoyi + * @date 2023-12-04 + */ +public interface SysProductItemMapper +{ + /** + * 查询生产团队 + * + * @param id 生产团队ID + * @return 生产团队 + */ + public SysProductItem selectSysProductItemById(Long id); + + /** + * 查询生产团队列表 + * + * @param sysProductItem 生产团队 + * @return 生产团队集合 + */ + public List selectSysProductItemList(SysProductItem sysProductItem); + + /** + * 新增生产团队 + * + * @param sysProductItem 生产团队 + * @return 结果 + */ + public int insertSysProductItem(SysProductItem sysProductItem); + + /** + * 修改生产团队 + * + * @param sysProductItem 生产团队 + * @return 结果 + */ + public int updateSysProductItem(SysProductItem sysProductItem); + + /** + * 删除生产团队 + * + * @param id 生产团队ID + * @return 结果 + */ + public int deleteSysProductItemById(Long id); + + /** + * 批量删除生产团队 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysProductItemByIds(String[] ids); + + /** + * 作废生产团队 + * + * @param id 生产团队ID + * @return 结果 + */ + public int cancelSysProductItemById(Long id); + + /** + * 恢复生产团队 + * + * @param id 生产团队ID + * @return 结果 + */ + public int restoreSysProductItemById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java new file mode 100644 index 00000000..4cb945eb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java @@ -0,0 +1,76 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.SysProductItem; + +import java.util.List; + +/** + * 生产团队Service接口 + * + * @author ruoyi + * @date 2023-12-04 + */ +public interface ISysProductItemService +{ + /** + * 查询生产团队 + * + * @param id 生产团队ID + * @return 生产团队 + */ + public SysProductItem selectSysProductItemById(Long id); + + /** + * 查询生产团队列表 + * + * @param sysProductItem 生产团队 + * @return 生产团队集合 + */ + public List selectSysProductItemList(SysProductItem sysProductItem); + + /** + * 新增生产团队 + * + * @param sysProductItem 生产团队 + * @return 结果 + */ + public int insertSysProductItem(SysProductItem sysProductItem); + + /** + * 修改生产团队 + * + * @param sysProductItem 生产团队 + * @return 结果 + */ + public int updateSysProductItem(SysProductItem sysProductItem); + + /** + * 批量删除生产团队 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysProductItemByIds(String ids); + + /** + * 删除生产团队信息 + * + * @param id 生产团队ID + * @return 结果 + */ + public int deleteSysProductItemById(Long id); + + /** + * 作废生产团队 + * @param id 生产团队ID + * @return + */ + int cancelSysProductItemById(Long id); + + /** + * 恢复生产团队 + * @param id 生产团队ID + * @return + */ + int restoreSysProductItemById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/SysErpMaterialProductItemService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/SysErpMaterialProductItemService.java new file mode 100644 index 00000000..612b07a9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/SysErpMaterialProductItemService.java @@ -0,0 +1,14 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.SysErpMaterialProductItem; + +import java.util.List; + +public interface SysErpMaterialProductItemService { + public List selectSysMaterialProductItemList(SysErpMaterialProductItem sysErpMaterialProductItem); + public SysErpMaterialProductItem selectSysMaterialProductItemListById(Long iconId); + public Integer insertSysErpMaterialProductItem(SysErpMaterialProductItem sysErpMaterialProductItem); + public Integer deleteSysErpMaterialProductItem(List list); + public Integer updateSysErpMaterialProductItem(SysErpMaterialProductItem sysErpMaterialProductItem); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysErpMaterialProductItemServiceIpml.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysErpMaterialProductItemServiceIpml.java new file mode 100644 index 00000000..93ebaf22 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysErpMaterialProductItemServiceIpml.java @@ -0,0 +1,37 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.system.domain.SysErpMaterialProductItem; +import com.ruoyi.system.mapper.SysErpMaterialProductItemMapper; +import com.ruoyi.system.service.SysErpMaterialProductItemService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SysErpMaterialProductItemServiceIpml implements SysErpMaterialProductItemService { + private SysErpMaterialProductItemMapper sysErpMaterialProductItemMapper; + @Override + public List selectSysMaterialProductItemList(SysErpMaterialProductItem sysErpMaterialProductItem) { + return sysErpMaterialProductItemMapper.selectSysMaterialProductItemList(sysErpMaterialProductItem); + } + + @Override + public SysErpMaterialProductItem selectSysMaterialProductItemListById(Long iconId) { + return sysErpMaterialProductItemMapper.selectSysMaterialProductItemListById(iconId); + } + + @Override + public Integer insertSysErpMaterialProductItem(SysErpMaterialProductItem sysErpMaterialProductItem) { + return sysErpMaterialProductItemMapper.insertSysErpMaterialProductItem(sysErpMaterialProductItem); + } + + @Override + public Integer deleteSysErpMaterialProductItem(List list) { + return sysErpMaterialProductItemMapper.deleteSysErpMaterialProductItem(list); + } + + @Override + public Integer updateSysErpMaterialProductItem(SysErpMaterialProductItem sysErpMaterialProductItem) { + return sysErpMaterialProductItemMapper.updateSysErpMaterialProductItem(sysErpMaterialProductItem); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java new file mode 100644 index 00000000..450d1f77 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java @@ -0,0 +1,127 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.system.domain.SysProductItem; +import com.ruoyi.system.mapper.SysProductItemMapper; +import com.ruoyi.system.service.ISysProductItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 生产团队Service业务层处理 + * + * @author ruoyi + * @date 2023-12-04 + */ +@Service("productItems") +public class SysProductItemServiceImpl implements ISysProductItemService +{ + @Autowired + private SysProductItemMapper sysProductItemMapper; + + /** + * 查询生产团队 + * + * @param id 生产团队ID + * @return 生产团队 + */ + @Override + public SysProductItem selectSysProductItemById(Long id) + { + return sysProductItemMapper.selectSysProductItemById(id); + } + + /** + * 查询生产团队列表 + * + * @param sysProductItem 生产团队 + * @return 生产团队 + */ + @Override + public List selectSysProductItemList(SysProductItem sysProductItem) + { + return sysProductItemMapper.selectSysProductItemList(sysProductItem); + } + + /** + * 新增生产团队 + * + * @param sysProductItem 生产团队 + * @return 结果 + */ + @Override + public int insertSysProductItem(SysProductItem sysProductItem) + { + String loginName = ShiroUtils.getLoginName(); + sysProductItem.setCreateBy(loginName); + sysProductItem.setCreateTime(DateUtils.getNowDate()); + return sysProductItemMapper.insertSysProductItem(sysProductItem); + } + + /** + * 修改生产团队 + * + * @param sysProductItem 生产团队 + * @return 结果 + */ + @Override + public int updateSysProductItem(SysProductItem sysProductItem) + { + String loginName = ShiroUtils.getLoginName(); + sysProductItem.setUpdateBy(loginName); + sysProductItem.setUpdateTime(DateUtils.getNowDate()); + return sysProductItemMapper.updateSysProductItem(sysProductItem); + } + + /** + * 删除生产团队对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysProductItemByIds(String ids) + { + return sysProductItemMapper.deleteSysProductItemByIds(Convert.toStrArray(ids)); + } + + /** + * 删除生产团队信息 + * + * @param id 生产团队ID + * @return 结果 + */ + @Override + public int deleteSysProductItemById(Long id) + { + return sysProductItemMapper.deleteSysProductItemById(id); + } + + /** + * 作废生产团队 + * + * @param id 生产团队ID + * @return 结果 + */ + @Override + public int cancelSysProductItemById(Long id) + { + return sysProductItemMapper.cancelSysProductItemById(id); + } + + /** + * 恢复生产团队信息 + * + * @param id 生产团队ID + * @return 结果 + */ + @Override + public int restoreSysProductItemById(Long id) + { + return sysProductItemMapper.restoreSysProductItemById(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysErpMaterialProductItemMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysErpMaterialProductItemMapper.xml new file mode 100644 index 00000000..cdfe8135 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/SysErpMaterialProductItemMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + select iconId,materialId,productItemId from + sys_erpmaterial_productitem + + + + + + + insert into sys_erpmaterial_productitem(`materialId`,`productItemId`); + + + delete from sys_erpmaterial_productitem + where iconId in + + #{id} + + + + update sys_erpmaterial_productitem set + materialId = #{materialId},productItemId = #{productItemId} + where iconId in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml new file mode 100644 index 00000000..49de0acd --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, types, productItem, create_by, create_time, update_by, updateTime, del_flag, functions, dianqi, struct, soft, test, zhuguan1, zhuguan2, manger, director from sys_product_item + + + + + + + + insert into sys_product_item + + types, + productItem, + create_by, + create_time, + update_by, + updateTime, + del_flag, + functions, + dianqi, + struct, + soft, + test, + zhuguan1, + zhuguan2, + manger, + director, + + + #{types}, + #{productItem}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + #{functions}, + #{dianqi}, + #{struct}, + #{soft}, + #{test}, + #{zhuguan1}, + #{zhuguan2}, + #{manger}, + #{director}, + + + + + update sys_product_item + + types = #{types}, + productItem = #{productItem}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + updateTime = #{updateTime}, + del_flag = #{delFlag}, + functions = #{functions}, + dianqi = #{dianqi}, + struct = #{struct}, + soft = #{soft}, + test = #{test}, + zhuguan1 = #{zhuguan1}, + zhuguan2 = #{zhuguan2}, + manger = #{manger}, + director = #{director}, + + where id = #{id} + + + + delete from sys_product_item where id = #{id} + + + + delete from sys_product_item where id in + + #{id} + + + + + update sys_product_item set del_flag = '1' where id = #{id} + + + + update sys_product_item set del_flag = '0' where id = #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html index 8439590d..0d62b274 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html @@ -11,14 +11,14 @@
    -
  • - - -
    • +
  • + + +
  • diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html index 9b9f201d..a623ddbd 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html @@ -37,13 +37,22 @@
- -
+
--> +
-
--> + +
+ +
+ +
+
@@ -215,6 +224,21 @@ $.operate.save(prefix + "/add", $('#form-material-add').serialize()); } } + + + index = 0; //图片数量 + const imageArray = new Map(); //保存的图片数量 + // 删除图片 + function delate(val) { + imageArray.delete(val); + index--; + if (index <= 4) { + $(".shangchuan").parent().parent().css("display", "block"); + } + } + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html index 3cce40ce..0216523d 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html @@ -6,26 +6,26 @@ -
+
- +
-
+
- +
- +
@@ -33,7 +33,7 @@
-
+
@@ -42,13 +42,13 @@
- +
-
+
- @@ -59,18 +59,18 @@
-
+
-
-
+
-
@@ -78,19 +78,19 @@
- +
- +
-
+
-
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html index b264906f..49bc06ae 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html @@ -121,7 +121,6 @@ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html index 5a9b0b5a..0a8259c2 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html @@ -92,6 +92,9 @@ 添加 + + 技术团队配置 +