From fe2e556036fa37011168655eec719b43c0fab49c Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Mon, 9 Jan 2023 14:55:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/starehouse/admin/StarehouseList.vue | 20 +++++++++---- .../admin/modules/StarehouseForm.vue | 28 +++++++++++++++---- .../demo/starehouse/entity/Starehouse.java | 8 ++++-- 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue b/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue index d44ef7ec..c391050f 100644 --- a/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue +++ b/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue @@ -21,10 +21,15 @@ + + + + + @@ -165,9 +170,9 @@ } }, { - title:'更新日期', + title:'创建日期', align:"center", - dataIndex: 'updateTime' + dataIndex: 'createTime' }, { title:'名称', @@ -184,16 +189,21 @@ align:"center", dataIndex: 'exclusive_dictText' }, - { + /*{ title:'仓库存储规则', align:"center", dataIndex: 'type_dictText' - }, + },*/ { title:'地址', align:"center", dataIndex: 'address' }, + { + title:'电话', + align:"center", + dataIndex: 'phoe' + }, { title:'管理员', align:"center", diff --git a/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue index b7698e44..a993d17c 100644 --- a/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue +++ b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue @@ -4,8 +4,8 @@ - - + + @@ -31,16 +31,24 @@ - + + + + + + + + + Date: Mon, 9 Jan 2023 15:08:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/kucun/admin/KucunList.vue | 131 ------------ .../views/kucun/admin/modules/KucunForm.vue | 188 ------------------ .../views/kucun/admin/modules/KucunModal.vue | 60 ------ .../modules/KucunModal__Style#Drawer.vue | 84 -------- 4 files changed, 463 deletions(-) delete mode 100644 ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue delete mode 100644 ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunForm.vue delete mode 100644 ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue delete mode 100644 ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue diff --git a/ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue b/ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue deleted file mode 100644 index 5f7ddc6b..00000000 --- a/ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue deleted file mode 100644 index b4d17544..00000000 --- a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue deleted file mode 100644 index 3c4c604e..00000000 --- a/ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file From 0065f52e32cb21df140f94240d0440a63205944b Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Mon, 9 Jan 2023 15:10:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kucun/controller/KucunController.java | 230 ------------------ .../modules/demo/kucun/entity/Kucun.java | 136 ----------- .../demo/kucun/mapper/KucunMapper.java | 19 -- .../demo/kucun/mapper/xml/KucunMapper.xml | 5 - .../demo/kucun/service/IKucunService.java | 16 -- .../kucun/service/impl/KucunServiceImpl.java | 19 -- 6 files changed, 425 deletions(-) delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/controller/KucunController.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/entity/Kucun.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/KucunMapper.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/xml/KucunMapper.xml delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/IKucunService.java delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/impl/KucunServiceImpl.java diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/controller/KucunController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/controller/KucunController.java deleted file mode 100644 index 98a6346a..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/controller/KucunController.java +++ /dev/null @@ -1,230 +0,0 @@ -package org.jeecg.modules.demo.kucun.controller; - - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.kucun.entity.Kucun; -import org.jeecg.modules.demo.kucun.service.IKucunService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; - - /** - * @Description: 库存信息 - * @Author: jeecg-boot - * @Date: 2023-01-07 - * @Version: V1.0 - */ -@Api(tags="库存信息") -@RestController -@RequestMapping("/kucun/kucun") -@Slf4j -public class KucunController extends JeecgController { - @Autowired - private IKucunService kucunService; - - /** - * 分页列表查询 - * - * @param kucun - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "库存信息-分页列表查询") - @ApiOperation(value="库存信息-分页列表查询", notes="库存信息-分页列表查询") - @GetMapping(value = "/list") - public Result queryPageList(Kucun kucun, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kucun, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = kucunService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param kucun - * @return - */ - @AutoLog(value = "库存信息-添加") - @ApiOperation(value="库存信息-添加", notes="库存信息-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody Kucun kucun) { - if(kucun.getWuplx().equals("1")){ - kucun.setTemp1(kucun.getMlname()); - kucun.setTemp2(kucun.getMlbh()); - System.out.println(kucun); - } - if(kucun.getWuplx().equals("2")){ - kucun.setTemp1(kucun.getFlname()); - kucun.setTemp2(kucun.getFlbh()); - System.out.println(kucun); - - } - if(kucun.getWuplx().equals("3")){ - kucun.setTemp1(kucun.getSbname()); - kucun.setTemp2(kucun.getSbbh()); - System.out.println(kucun); - - } - if(kucun.getWuplx().equals("4")){ - kucun.setTemp1(kucun.getGjname()); - kucun.setTemp2(kucun.getGjbh()); - System.out.println(kucun); - - } - if(kucun.getWuplx().equals("5")){ - kucun.setTemp1(kucun.getSpname()); - kucun.setTemp2(kucun.getSpbh()); - System.out.println(kucun); - - } - kucunService.save(kucun); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param kucun - * @return - */ - @AutoLog(value = "库存信息-编辑") - @ApiOperation(value="库存信息-编辑", notes="库存信息-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody Kucun kucun) { - if(kucun.getWuplx().equals("1")){ - kucun.setTemp1(kucun.getMlname()); - kucun.setTemp2(kucun.getMlbh()); - System.out.println(kucun); - } - if(kucun.getWuplx().equals("2")){ - kucun.setTemp1(kucun.getFlname()); - kucun.setTemp2(kucun.getFlbh()); - System.out.println(kucun); - - } - if(kucun.getWuplx().equals("3")){ - kucun.setTemp1(kucun.getSbname()); - kucun.setTemp2(kucun.getSbbh()); - System.out.println(kucun); - - } - if(kucun.getWuplx().equals("4")){ - kucun.setTemp1(kucun.getGjname()); - kucun.setTemp2(kucun.getGjbh()); - System.out.println(kucun); - - } - if(kucun.getWuplx().equals("5")){ - kucun.setTemp1(kucun.getSpname()); - kucun.setTemp2(kucun.getSpbh()); - System.out.println(kucun); - - } - kucunService.updateById(kucun); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "库存信息-通过id删除") - @ApiOperation(value="库存信息-通过id删除", notes="库存信息-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - kucunService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "库存信息-批量删除") - @ApiOperation(value="库存信息-批量删除", notes="库存信息-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.kucunService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "库存信息-通过id查询") - @ApiOperation(value="库存信息-通过id查询", notes="库存信息-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Kucun kucun = kucunService.getById(id); - if(kucun==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(kucun); - } - - /** - * 导出excel - * - * @param request - * @param kucun - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, Kucun kucun) { - return super.exportXls(request, kucun, Kucun.class, "库存信息"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, Kucun.class); - } - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/entity/Kucun.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/entity/Kucun.java deleted file mode 100644 index 73823bd0..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/entity/Kucun.java +++ /dev/null @@ -1,136 +0,0 @@ -package org.jeecg.modules.demo.kucun.entity; - - - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 库存信息 - * @Author: jeecg-boot - * @Date: 2023-01-07 - * @Version: V1.0 - */ -@Data -@TableName("kucun") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="kucun对象", description="库存信息") -public class Kucun implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - /**物品类型*/ - @Excel(name = "物品类型", width = 15, dicCode = "goods_category") - @Dict(dicCode = "goods_category") - @ApiModelProperty(value = "物品类型") - private String wuplx; - /**面料*/ - @Excel(name = "面料", width = 15) - @ApiModelProperty(value = "面料") - private String mlid; - /**面料编号*/ - @Excel(name = "面料编号", width = 15) - @ApiModelProperty(value = "面料编号") - private String mlbh; - /**面料*/ - @Excel(name = "面料", width = 15) - @ApiModelProperty(value = "面料") - private String mlname; - /**辅料*/ - @Excel(name = "辅料", width = 15) - @ApiModelProperty(value = "辅料") - private String flid; - /**辅料编号*/ - @Excel(name = "辅料编号", width = 15) - @ApiModelProperty(value = "辅料编号") - private String flbh; - /**辅料*/ - @Excel(name = "辅料", width = 15) - @ApiModelProperty(value = "辅料") - private String flname; - /**设备*/ - @Excel(name = "设备", width = 15) - @ApiModelProperty(value = "设备") - private String sbid; - /**设备编号*/ - @Excel(name = "设备编号", width = 15) - @ApiModelProperty(value = "设备编号") - private String sbbh; - /**设备*/ - @Excel(name = "设备", width = 15) - @ApiModelProperty(value = "设备") - private String sbname; - /**工具*/ - @Excel(name = "工具", width = 15) - @ApiModelProperty(value = "工具") - private String gjid; - /**工具编号*/ - @Excel(name = "工具编号", width = 15) - @ApiModelProperty(value = "工具编号") - private String gjbh; - /**工具*/ - @Excel(name = "工具", width = 15) - @ApiModelProperty(value = "工具") - private String gjname; - /**商品*/ - @Excel(name = "商品", width = 15) - @ApiModelProperty(value = "商品") - private String spid; - /**商品编号*/ - @Excel(name = "商品编号", width = 15) - @ApiModelProperty(value = "商品编号") - private String spbh; - /**商品*/ - @Excel(name = "商品", width = 15) - @ApiModelProperty(value = "商品") - private String spname; - /**库存剩余*/ - @Excel(name = "库存剩余", width = 15) - @ApiModelProperty(value = "库存剩余") - private Integer kcsy; - /**名称*/ - @Excel(name = "名称", width = 15) - @ApiModelProperty(value = "名称") - private String temp1; - /**编号*/ - @Excel(name = "编号", width = 15) - @ApiModelProperty(value = "编号") - private String temp2; -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/KucunMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/KucunMapper.java deleted file mode 100644 index 639e127d..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/KucunMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.kucun.mapper; - - - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.kucun.entity.Kucun; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 库存信息 - * @Author: jeecg-boot - * @Date: 2023-01-07 - * @Version: V1.0 - */ -public interface KucunMapper extends BaseMapper { - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/xml/KucunMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/xml/KucunMapper.xml deleted file mode 100644 index 77d368d2..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/xml/KucunMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/IKucunService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/IKucunService.java deleted file mode 100644 index 133a886f..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/IKucunService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jeecg.modules.demo.kucun.service; - - - -import org.jeecg.modules.demo.kucun.entity.Kucun; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 库存信息 - * @Author: jeecg-boot - * @Date: 2023-01-07 - * @Version: V1.0 - */ -public interface IKucunService extends IService { - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/impl/KucunServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/impl/KucunServiceImpl.java deleted file mode 100644 index a1a6119a..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/impl/KucunServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.kucun.service.impl; - -import org.jeecg.modules.demo.kucun.entity.Kucun; -import org.jeecg.modules.demo.kucun.mapper.KucunMapper; -import org.jeecg.modules.demo.kucun.service.IKucunService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 库存信息 - * @Author: jeecg-boot - * @Date: 2023-01-07 - * @Version: V1.0 - */ -@Service -public class KucunServiceImpl extends ServiceImpl implements IKucunService { - -}