diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sapMaterial/SapMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sapMaterial/SapMaterialController.java new file mode 100644 index 0000000..e76e685 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sapMaterial/SapMaterialController.java @@ -0,0 +1,104 @@ +package com.ruoyi.web.controller.sapMaterial; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.sapMaterial.domain.SapMaterial; +import com.ruoyi.sapMaterial.service.ISapMaterialService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 物料管理Controller + * + * @author ruoyi + * @date 2024-03-12 + */ +@RestController +@RequestMapping("/sapMaterial/sapMaterial") +public class SapMaterialController extends BaseController +{ + @Autowired + private ISapMaterialService sapMaterialService; + + /** + * 查询物料管理列表 + */ + @PreAuthorize("@ss.hasPermi('sapMaterial:sapMaterial:list')") + @GetMapping("/list") + public TableDataInfo list(SapMaterial sapMaterial) + { + startPage(); + List list = sapMaterialService.selectSapMaterialList(sapMaterial); + return getDataTable(list); + } + + /** + * 导出物料管理列表 + */ + @PreAuthorize("@ss.hasPermi('sapMaterial:sapMaterial:export')") + @Log(title = "物料管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SapMaterial sapMaterial) + { + List list = sapMaterialService.selectSapMaterialList(sapMaterial); + ExcelUtil util = new ExcelUtil(SapMaterial.class); + util.exportExcel(response, list, "物料管理数据"); + } + + /** + * 获取物料管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('sapMaterial:sapMaterial:query')") + @GetMapping(value = "/{materialId}") + public AjaxResult getInfo(@PathVariable("materialId") Long materialId) + { + return success(sapMaterialService.selectSapMaterialByMaterialId(materialId)); + } + + /** + * 新增物料管理 + */ + @PreAuthorize("@ss.hasPermi('sapMaterial:sapMaterial:add')") + @Log(title = "物料管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SapMaterial sapMaterial) + { + return toAjax(sapMaterialService.insertSapMaterial(sapMaterial)); + } + + /** + * 修改物料管理 + */ + @PreAuthorize("@ss.hasPermi('sapMaterial:sapMaterial:edit')") + @Log(title = "物料管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SapMaterial sapMaterial) + { + return toAjax(sapMaterialService.updateSapMaterial(sapMaterial)); + } + + /** + * 删除物料管理 + */ + @PreAuthorize("@ss.hasPermi('sapMaterial:sapMaterial:remove')") + @Log(title = "物料管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{materialIds}") + public AjaxResult remove(@PathVariable Long[] materialIds) + { + return toAjax(sapMaterialService.deleteSapMaterialByMaterialIds(materialIds)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/sapAccount/domain/SapAccount.java b/ruoyi-system/src/main/java/com/ruoyi/sapAccount/domain/SapAccount.java index 1b818aa..69651c1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/sapAccount/domain/SapAccount.java +++ b/ruoyi-system/src/main/java/com/ruoyi/sapAccount/domain/SapAccount.java @@ -18,6 +18,14 @@ public class SapAccount extends BaseEntity /** */ private Long id; + /** 登录账号 */ + @Excel(name = "登录账号") + private String userName; + + /** 登录名 */ + @Excel(name = "登录名") + private String nickName; + /** 账户 */ @Excel(name = "账户") private String sapBm; @@ -39,6 +47,12 @@ public class SapAccount extends BaseEntity { return id; } + public String getNickName() {return nickName;} + + public void setNickName(String nickName) {this.nickName = nickName;} + public String getUserName() {return userName;} + + public void setUserName(String userName) {this.userName = userName;} public void setSapBm(String sapBm) { this.sapBm = sapBm; diff --git a/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/domain/SapMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/domain/SapMaterial.java new file mode 100644 index 0000000..87ad962 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/domain/SapMaterial.java @@ -0,0 +1,297 @@ +package com.ruoyi.sapMaterial.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; + +/** + * 物料管理对象 sap_material + * + * @author ruoyi + * @date 2024-03-12 + */ +public class SapMaterial extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 物料id */ + private Long materialId; + + /** 编码 */ + @Excel(name = "编码") + private String materialMatnr; + + /** 名称 */ + @Excel(name = "名称") + private String materialMaktx; + + /** 销售组织 */ + @Excel(name = "销售组织") + private String materialVkorg; + + /** 分销渠道 */ + @Excel(name = "分销渠道") + private String materialVtweg; + + /** 单位 */ + @Excel(name = "单位") + private String materialMeins; + + /** 产品组 */ + @Excel(name = "产品组") + private String materialSpart; + + /** 产品组描述 */ + @Excel(name = "产品组描述") + private String materialVtext; + + /** 类别 */ + @Excel(name = "类别") + private String materialMatkl; + + /** 类别描述 */ + @Excel(name = "类别描述") + private String materialWgbez; + + /** 单位净重 */ + @Excel(name = "单位净重") + private String materialDwjz; + + /** 厂价 */ + @Excel(name = "厂价") + private String materialChangj; + + /** 型号 */ + private String materialXingh; + + /** 规格 */ + private String materialGuig; + + /** 截面 */ + private String materialJiem; + + /** 电压 */ + private String materialDiany; + + /** 临时字段 */ + private String materialTemp; + + /** 临时字段(IEC型号) */ + private String materialModel; + + /** 标识(100米/卷) */ + @Excel(name = "标识(100米/卷)") + private String materialMrbs; + + /** 是否有效 */ + @Excel(name = "是否有效") + private String materialSfyx; + + public void setMaterialId(Long materialId) + { + this.materialId = materialId; + } + + public Long getMaterialId() + { + return materialId; + } + public void setMaterialMatnr(String materialMatnr) + { + this.materialMatnr = materialMatnr; + } + + public String getMaterialMatnr() + { + return materialMatnr; + } + public void setMaterialMaktx(String materialMaktx) + { + this.materialMaktx = materialMaktx; + } + + public String getMaterialMaktx() + { + return materialMaktx; + } + public void setMaterialVkorg(String materialVkorg) + { + this.materialVkorg = materialVkorg; + } + + public String getMaterialVkorg() + { + return materialVkorg; + } + public void setMaterialVtweg(String materialVtweg) + { + this.materialVtweg = materialVtweg; + } + + public String getMaterialVtweg() + { + return materialVtweg; + } + public void setMaterialMeins(String materialMeins) + { + this.materialMeins = materialMeins; + } + + public String getMaterialMeins() + { + return materialMeins; + } + public void setMaterialSpart(String materialSpart) + { + this.materialSpart = materialSpart; + } + + public String getMaterialSpart() + { + return materialSpart; + } + public void setMaterialVtext(String materialVtext) + { + this.materialVtext = materialVtext; + } + + public String getMaterialVtext() + { + return materialVtext; + } + public void setMaterialMatkl(String materialMatkl) + { + this.materialMatkl = materialMatkl; + } + + public String getMaterialMatkl() + { + return materialMatkl; + } + public void setMaterialWgbez(String materialWgbez) + { + this.materialWgbez = materialWgbez; + } + + public String getMaterialWgbez() + { + return materialWgbez; + } + public void setMaterialDwjz(String materialDwjz) + { + this.materialDwjz = materialDwjz; + } + + public String getMaterialDwjz() + { + return materialDwjz; + } + public void setMaterialChangj(String materialChangj) + { + this.materialChangj = materialChangj; + } + + public String getMaterialChangj() + { + return materialChangj; + } + public void setMaterialXingh(String materialXingh) + { + this.materialXingh = materialXingh; + } + + public String getMaterialXingh() + { + return materialXingh; + } + public void setMaterialGuig(String materialGuig) + { + this.materialGuig = materialGuig; + } + + public String getMaterialGuig() + { + return materialGuig; + } + public void setMaterialJiem(String materialJiem) + { + this.materialJiem = materialJiem; + } + + public String getMaterialJiem() + { + return materialJiem; + } + public void setMaterialDiany(String materialDiany) + { + this.materialDiany = materialDiany; + } + + public String getMaterialDiany() + { + return materialDiany; + } + public void setMaterialTemp(String materialTemp) + { + this.materialTemp = materialTemp; + } + + public String getMaterialTemp() + { + return materialTemp; + } + public void setMaterialModel(String materialModel) + { + this.materialModel = materialModel; + } + + public String getMaterialModel() + { + return materialModel; + } + public void setMaterialMrbs(String materialMrbs) + { + this.materialMrbs = materialMrbs; + } + + public String getMaterialMrbs() + { + return materialMrbs; + } + public void setMaterialSfyx(String materialSfyx) + { + this.materialSfyx = materialSfyx; + } + + public String getMaterialSfyx() + { + return materialSfyx; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("materialId", getMaterialId()) + .append("materialMatnr", getMaterialMatnr()) + .append("materialMaktx", getMaterialMaktx()) + .append("materialVkorg", getMaterialVkorg()) + .append("materialVtweg", getMaterialVtweg()) + .append("materialMeins", getMaterialMeins()) + .append("materialSpart", getMaterialSpart()) + .append("materialVtext", getMaterialVtext()) + .append("materialMatkl", getMaterialMatkl()) + .append("materialWgbez", getMaterialWgbez()) + .append("materialDwjz", getMaterialDwjz()) + .append("materialChangj", getMaterialChangj()) + .append("materialXingh", getMaterialXingh()) + .append("materialGuig", getMaterialGuig()) + .append("materialJiem", getMaterialJiem()) + .append("materialDiany", getMaterialDiany()) + .append("materialTemp", getMaterialTemp()) + .append("materialModel", getMaterialModel()) + .append("materialMrbs", getMaterialMrbs()) + .append("materialSfyx", getMaterialSfyx()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/mapper/SapMaterialMapper.java b/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/mapper/SapMaterialMapper.java new file mode 100644 index 0000000..b46f19c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/mapper/SapMaterialMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.sapMaterial.mapper; + +import java.util.List; +import com.ruoyi.sapMaterial.domain.SapMaterial; + +/** + * 物料管理Mapper接口 + * + * @author ruoyi + * @date 2024-03-12 + */ +public interface SapMaterialMapper +{ + /** + * 查询物料管理 + * + * @param materialId 物料管理主键 + * @return 物料管理 + */ + public SapMaterial selectSapMaterialByMaterialId(Long materialId); + + /** + * 查询物料管理列表 + * + * @param sapMaterial 物料管理 + * @return 物料管理集合 + */ + public List selectSapMaterialList(SapMaterial sapMaterial); + + /** + * 新增物料管理 + * + * @param sapMaterial 物料管理 + * @return 结果 + */ + public int insertSapMaterial(SapMaterial sapMaterial); + + /** + * 修改物料管理 + * + * @param sapMaterial 物料管理 + * @return 结果 + */ + public int updateSapMaterial(SapMaterial sapMaterial); + + /** + * 删除物料管理 + * + * @param materialId 物料管理主键 + * @return 结果 + */ + public int deleteSapMaterialByMaterialId(Long materialId); + + /** + * 批量删除物料管理 + * + * @param materialIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSapMaterialByMaterialIds(Long[] materialIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/service/ISapMaterialService.java b/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/service/ISapMaterialService.java new file mode 100644 index 0000000..6f02494 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/service/ISapMaterialService.java @@ -0,0 +1,61 @@ +package com.ruoyi.sapMaterial.service; + +import java.util.List; +import com.ruoyi.sapMaterial.domain.SapMaterial; + +/** + * 物料管理Service接口 + * + * @author ruoyi + * @date 2024-03-12 + */ +public interface ISapMaterialService +{ + /** + * 查询物料管理 + * + * @param materialId 物料管理主键 + * @return 物料管理 + */ + public SapMaterial selectSapMaterialByMaterialId(Long materialId); + + /** + * 查询物料管理列表 + * + * @param sapMaterial 物料管理 + * @return 物料管理集合 + */ + public List selectSapMaterialList(SapMaterial sapMaterial); + + /** + * 新增物料管理 + * + * @param sapMaterial 物料管理 + * @return 结果 + */ + public int insertSapMaterial(SapMaterial sapMaterial); + + /** + * 修改物料管理 + * + * @param sapMaterial 物料管理 + * @return 结果 + */ + public int updateSapMaterial(SapMaterial sapMaterial); + + /** + * 批量删除物料管理 + * + * @param materialIds 需要删除的物料管理主键集合 + * @return 结果 + */ + public int deleteSapMaterialByMaterialIds(Long[] materialIds); + + /** + * 删除物料管理信息 + * + * @param materialId 物料管理主键 + * @return 结果 + */ + public int deleteSapMaterialByMaterialId(Long materialId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/service/impl/SapMaterialServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/service/impl/SapMaterialServiceImpl.java new file mode 100644 index 0000000..ef3e300 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/sapMaterial/service/impl/SapMaterialServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.sapMaterial.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.sapMaterial.mapper.SapMaterialMapper; +import com.ruoyi.sapMaterial.domain.SapMaterial; +import com.ruoyi.sapMaterial.service.ISapMaterialService; + +/** + * 物料管理Service业务层处理 + * + * @author ruoyi + * @date 2024-03-12 + */ +@Service +public class SapMaterialServiceImpl implements ISapMaterialService +{ + @Autowired + private SapMaterialMapper sapMaterialMapper; + + /** + * 查询物料管理 + * + * @param materialId 物料管理主键 + * @return 物料管理 + */ + @Override + public SapMaterial selectSapMaterialByMaterialId(Long materialId) + { + return sapMaterialMapper.selectSapMaterialByMaterialId(materialId); + } + + /** + * 查询物料管理列表 + * + * @param sapMaterial 物料管理 + * @return 物料管理 + */ + @Override + public List selectSapMaterialList(SapMaterial sapMaterial) + { + return sapMaterialMapper.selectSapMaterialList(sapMaterial); + } + + /** + * 新增物料管理 + * + * @param sapMaterial 物料管理 + * @return 结果 + */ + @Override + public int insertSapMaterial(SapMaterial sapMaterial) + { + return sapMaterialMapper.insertSapMaterial(sapMaterial); + } + + /** + * 修改物料管理 + * + * @param sapMaterial 物料管理 + * @return 结果 + */ + @Override + public int updateSapMaterial(SapMaterial sapMaterial) + { + return sapMaterialMapper.updateSapMaterial(sapMaterial); + } + + /** + * 批量删除物料管理 + * + * @param materialIds 需要删除的物料管理主键 + * @return 结果 + */ + @Override + public int deleteSapMaterialByMaterialIds(Long[] materialIds) + { + return sapMaterialMapper.deleteSapMaterialByMaterialIds(materialIds); + } + + /** + * 删除物料管理信息 + * + * @param materialId 物料管理主键 + * @return 结果 + */ + @Override + public int deleteSapMaterialByMaterialId(Long materialId) + { + return sapMaterialMapper.deleteSapMaterialByMaterialId(materialId); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/sapAccount/SapAccountMapper.xml b/ruoyi-system/src/main/resources/mapper/sapAccount/SapAccountMapper.xml index 2dda441..1434f99 100644 --- a/ruoyi-system/src/main/resources/mapper/sapAccount/SapAccountMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/sapAccount/SapAccountMapper.xml @@ -6,37 +6,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + left join sys_user u on u.user_name = a.user_name + + - select id, sap_bm, sap_name, sap_area from sap_account + select a.id, a.user_name, case when u.status is null then a.user_name+'(登录账号不存在)' when u.status = '1' then u.nick_name+'(停用)' else u.nick_name end nick_name, a.sap_bm, a.sap_name, a.sap_area + from sap_account a + insert into sap_account + user_name, sap_bm, sap_name, sap_area, + #{userName}, #{sapBm}, #{sapName}, #{sapArea}, @@ -47,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sap_account user_name = #{userName}, - nick_name = #{nickName}, sap_bm = #{sapBm}, sap_name = #{sapName}, sap_area = #{sapArea}, diff --git a/ruoyi-system/src/main/resources/mapper/sapMaterial/SapMaterialMapper.xml b/ruoyi-system/src/main/resources/mapper/sapMaterial/SapMaterialMapper.xml new file mode 100644 index 0000000..f0cd70e --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/sapMaterial/SapMaterialMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + left join Redbook.RedBook.dbo.sdmdm1 rdm on rdm.matnr='0000000000'+sm.material_matnr + + + + select sm.material_id, sm.material_matnr, sm.material_maktx, sm.material_vkorg, sm.material_vtweg, + sm.material_meins, sm.material_spart, sm.material_vtext, sm.material_matkl, sm.material_wgbez, sm.material_dwjz, + case when rdm.当前厂价=0 then null else rdm.当前厂价 end material_changj, sm.material_xingh, sm.material_guig, + sm.material_jiem, sm.material_diany, sm.material_temp, + sm.material_model, material_mrbs, material_sfyx + from sap_material sm + + + + + + + + + insert into sap_material + + material_matnr, + material_maktx, + material_vkorg, + material_vtweg, + material_meins, + material_spart, + material_vtext, + material_matkl, + material_wgbez, + material_dwjz, + material_changj, + material_xingh, + material_guig, + material_jiem, + material_diany, + material_temp, + material_model, + material_mrbs, + material_sfyx, + + + #{materialMatnr}, + #{materialMaktx}, + #{materialVkorg}, + #{materialVtweg}, + #{materialMeins}, + #{materialSpart}, + #{materialVtext}, + #{materialMatkl}, + #{materialWgbez}, + #{materialDwjz}, + #{materialChangj}, + #{materialXingh}, + #{materialGuig}, + #{materialJiem}, + #{materialDiany}, + #{materialTemp}, + #{materialModel}, + #{materialMrbs}, + #{materialSfyx}, + + + + + update sap_material + + material_matnr = #{materialMatnr}, + material_maktx = #{materialMaktx}, + material_vkorg = #{materialVkorg}, + material_vtweg = #{materialVtweg}, + material_meins = #{materialMeins}, + material_spart = #{materialSpart}, + material_vtext = #{materialVtext}, + material_matkl = #{materialMatkl}, + material_wgbez = #{materialWgbez}, + material_dwjz = #{materialDwjz}, + material_changj = #{materialChangj}, + material_xingh = #{materialXingh}, + material_guig = #{materialGuig}, + material_jiem = #{materialJiem}, + material_diany = #{materialDiany}, + material_temp = #{materialTemp}, + material_model = #{materialModel}, + material_mrbs = #{materialMrbs}, + material_sfyx = #{materialSfyx}, + + where material_id = #{materialId} + + + + delete from sap_material where material_id = #{materialId} + + + + delete from sap_material where material_id in + + #{materialId} + + + diff --git a/ruoyi-ui/src/api/sapMaterial/sapMaterial.js b/ruoyi-ui/src/api/sapMaterial/sapMaterial.js new file mode 100644 index 0000000..182b4bf --- /dev/null +++ b/ruoyi-ui/src/api/sapMaterial/sapMaterial.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询物料管理列表 +export function listSapMaterial(query) { + return request({ + url: '/sapMaterial/sapMaterial/list', + method: 'get', + params: query + }) +} + +// 查询物料管理详细 +export function getSapMaterial(materialId) { + return request({ + url: '/sapMaterial/sapMaterial/' + materialId, + method: 'get' + }) +} + +// 新增物料管理 +export function addSapMaterial(data) { + return request({ + url: '/sapMaterial/sapMaterial', + method: 'post', + data: data + }) +} + +// 修改物料管理 +export function updateSapMaterial(data) { + return request({ + url: '/sapMaterial/sapMaterial', + method: 'put', + data: data + }) +} + +// 删除物料管理 +export function delSapMaterial(materialId) { + return request({ + url: '/sapMaterial/sapMaterial/' + materialId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/sapAccount/sapAccount/index.vue b/ruoyi-ui/src/views/sapAccount/sapAccount/index.vue index b86fd01..94acffb 100644 --- a/ruoyi-ui/src/views/sapAccount/sapAccount/index.vue +++ b/ruoyi-ui/src/views/sapAccount/sapAccount/index.vue @@ -1,6 +1,14 @@