From b412bf6a4bba31d762e10ac214a3ab94daa0460d Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Mon, 9 Jan 2023 17:15:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=88=E9=87=8D?= =?UTF-8?q?=E6=9E=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/storage/StorageList.vue | 230 ++++++++++++++++++ .../src/views/storage/modules/StorageForm.vue | 213 ++++++++++++++++ .../views/storage/modules/StorageModal.vue | 60 +++++ .../modules/StorageModal__Style#Drawer.vue | 84 +++++++ 4 files changed, 587 insertions(+) create mode 100644 ant-design-vue-jeecg/src/views/storage/StorageList.vue create mode 100644 ant-design-vue-jeecg/src/views/storage/modules/StorageForm.vue create mode 100644 ant-design-vue-jeecg/src/views/storage/modules/StorageModal.vue create mode 100644 ant-design-vue-jeecg/src/views/storage/modules/StorageModal__Style#Drawer.vue diff --git a/ant-design-vue-jeecg/src/views/storage/StorageList.vue b/ant-design-vue-jeecg/src/views/storage/StorageList.vue new file mode 100644 index 00000000..669cc53f --- /dev/null +++ b/ant-design-vue-jeecg/src/views/storage/StorageList.vue @@ -0,0 +1,230 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/storage/modules/StorageForm.vue b/ant-design-vue-jeecg/src/views/storage/modules/StorageForm.vue new file mode 100644 index 00000000..679936ce --- /dev/null +++ b/ant-design-vue-jeecg/src/views/storage/modules/StorageForm.vue @@ -0,0 +1,213 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/storage/modules/StorageModal.vue b/ant-design-vue-jeecg/src/views/storage/modules/StorageModal.vue new file mode 100644 index 00000000..33716286 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/storage/modules/StorageModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/storage/modules/StorageModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/storage/modules/StorageModal__Style#Drawer.vue new file mode 100644 index 00000000..d5869203 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/storage/modules/StorageModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file From 66dc4fb6c76b0110b23b542917cd998a6e8d838f Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Mon, 9 Jan 2023 17:18:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=88=E9=87=8D?= =?UTF-8?q?=E6=9E=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/controller/StorageController.java | 172 ++++++++++++++++++ .../modules/demo/storage/entity/Storage.java | 85 +++++++++ .../demo/storage/mapper/StorageMapper.java | 18 ++ .../demo/storage/mapper/xml/StorageMapper.xml | 5 + .../demo/storage/service/IStorageService.java | 16 ++ .../service/impl/StorageServiceImpl.java | 20 ++ 6 files changed, 316 insertions(+) create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/controller/StorageController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/entity/Storage.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/mapper/StorageMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/mapper/xml/StorageMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/service/IStorageService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/service/impl/StorageServiceImpl.java diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/controller/StorageController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/controller/StorageController.java new file mode 100644 index 00000000..2d4f760e --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/controller/StorageController.java @@ -0,0 +1,172 @@ +package org.jeecg.modules.demo.storage.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.storage.entity.Storage; +import org.jeecg.modules.demo.storage.service.IStorageService; + +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-09 + * @Version: V1.0 + */ +@Api(tags="库存表") +@RestController +@RequestMapping("/storage/storage") +@Slf4j +public class StorageController extends JeecgController { + @Autowired + private IStorageService storageService; + + /** + * 分页列表查询 + * + * @param storage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "库存表-分页列表查询") + @ApiOperation(value="库存表-分页列表查询", notes="库存表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(Storage storage, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(storage, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = storageService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param storage + * @return + */ + @AutoLog(value = "库存表-添加") + @ApiOperation(value="库存表-添加", notes="库存表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody Storage storage) { + storageService.save(storage); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param storage + * @return + */ + @AutoLog(value = "库存表-编辑") + @ApiOperation(value="库存表-编辑", notes="库存表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody Storage storage) { + storageService.updateById(storage); + 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) { + storageService.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.storageService.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) { + Storage storage = storageService.getById(id); + if(storage==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(storage); + } + + /** + * 导出excel + * + * @param request + * @param storage + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Storage storage) { + return super.exportXls(request, storage, Storage.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, Storage.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/entity/Storage.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/entity/Storage.java new file mode 100644 index 00000000..d64b256c --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/entity/Storage.java @@ -0,0 +1,85 @@ +package org.jeecg.modules.demo.storage.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; + + +@Data +@TableName("storage") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="storage对象", description="库存表") +public class Storage implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**仓库*/ + @Excel(name = "仓库", width = 15, dictTable = "starehouse", dicText = "name", dicCode = "id") + @Dict(dictTable = "starehouse", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "仓库") + private java.lang.String storehouseId; + /**物品类型*/ + @Excel(name = "物品类型", width = 15, dicCode = "goods_category") + @Dict(dicCode = "goods_category") + @ApiModelProperty(value = "物品类型") + private java.lang.String itemType; + /**物品编码*/ + @Excel(name = "物品编码", width = 15) + @ApiModelProperty(value = "物品编码") + private java.lang.String itemCode; + /**存量*/ + @Excel(name = "存量", width = 15) + @ApiModelProperty(value = "存量") + private java.lang.Double amount; + /**单位*/ + @Excel(name = "单位", width = 15) + @ApiModelProperty(value = "单位") + private java.lang.String unit; + /**管理员*/ + @Excel(name = "管理员", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + @ApiModelProperty(value = "管理员") + private java.lang.String adminId; + /**管理员*/ + @Excel(name = "管理员", width = 15) + @ApiModelProperty(value = "管理员") + private java.lang.String adminname; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/mapper/StorageMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/mapper/StorageMapper.java new file mode 100644 index 00000000..3020f509 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/mapper/StorageMapper.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.demo.storage.mapper; + + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.storage.entity.Storage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 库存表 + * @Author: jeecg-boot + * @Date: 2023-01-09 + * @Version: V1.0 + */ +public interface StorageMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/mapper/xml/StorageMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/mapper/xml/StorageMapper.xml new file mode 100644 index 00000000..cc219509 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/mapper/xml/StorageMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/service/IStorageService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/service/IStorageService.java new file mode 100644 index 00000000..fa215575 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/service/IStorageService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.demo.storage.service; + + + +import org.jeecg.modules.demo.storage.entity.Storage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 库存表 + * @Author: jeecg-boot + * @Date: 2023-01-09 + * @Version: V1.0 + */ +public interface IStorageService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/service/impl/StorageServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/service/impl/StorageServiceImpl.java new file mode 100644 index 00000000..0a5a4f08 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/storage/service/impl/StorageServiceImpl.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.demo.storage.service.impl; + + +import org.jeecg.modules.demo.storage.entity.Storage; +import org.jeecg.modules.demo.storage.mapper.StorageMapper; +import org.jeecg.modules.demo.storage.service.IStorageService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 库存表 + * @Author: jeecg-boot + * @Date: 2023-01-09 + * @Version: V1.0 + */ +@Service +public class StorageServiceImpl extends ServiceImpl implements IStorageService { + +} From de16d80234fdf01a3c1368d808c54dc5b4a12b68 Mon Sep 17 00:00:00 2001 From: mors <3067699729@qq.com> Date: Mon, 9 Jan 2023 17:37:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8A=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/jeecg/JVxeTable/jvxeTypes.js | 1 + .../process/modules/ZyClothsComponentForm.vue | 2 +- .../process/modules/ZyClothsModularForm.vue | 14 +- .../views/zystylemodel/ZyStyleModelList.vue | 209 +++++++++++++----- .../ZyClothsComponentController.java | 4 +- .../controller/ZyClothsModularController.java | 2 +- .../impl/ZyClothsModularServiceImpl.java | 2 +- .../controller/ZyStyleModelController.java | 9 +- .../service/IZyStyleModelService.java | 2 + .../service/impl/ZyStyleModelServiceImpl.java | 32 +++ 10 files changed, 206 insertions(+), 71 deletions(-) diff --git a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/jvxeTypes.js b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/jvxeTypes.js index 444a51a3..32140d09 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/jvxeTypes.js +++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/jvxeTypes.js @@ -17,6 +17,7 @@ export const JVXETypes = { rowDragSort: 'row-drag-sort', input: 'input', + //数字输入框 只能输入数字 小数也可以 其它类型的无法输入 inputNumber: 'inputNumber', textarea: 'textarea', select: 'select', diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue index a3a47ce6..ecaaf4f2 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue @@ -208,7 +208,7 @@ // this.data.push(res.result) // } - //console.log("制衣部件List 编号 "+this.model.nums); + console.log("制衣部件 编号: "+this.model.nums); }, // bianHao() { // getAction(this.url.sort, {id: this.model.clothsTypeId}).then((res) => { diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue index 2ecb5213..62607b6f 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue @@ -132,7 +132,9 @@ export default { }, data() { return { - model: {}, + model: { + nums: '', + }, labelCol: { xs: {span: 24}, sm: {span: 4}, @@ -174,17 +176,17 @@ export default { this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, methods: { - bianhao() { + async bianhao() { //var n=6 getAction(this.url.sort, {id: this.model.clothsTypeId}).then((res) => { - let num = res.result; - console.log("+6++++aaa" + num) + //let num = res.result; + console.log("+6++++aaa: " + res.result) //num=num.toString() //while(num.length

{{biaoTi}}

- - - - - - - - - + + + + + + + + + - + -
+