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/8] =?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/8] =?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/8] =?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 { - -} From 6ec71c6b2e3dbf3dd0988a9cb9bf31a4b96c0ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Mon, 9 Jan 2023 15:41:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?2023-07-09-01-=E6=B4=BE=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/clothSample/ZyClothSampleList.vue | 40 ++-- .../clothSample/modules/ZyClothSampleForm.vue | 39 +++- .../ZyProductionOrderList.vue | 22 +- .../zyWorkorderManagement/ZyWorkOrderList.vue | 10 +- .../workdep/JSelectProductionDep.vue | 203 ++++++++++++++++++ .../controller/WorkOrderController.java | 80 ++++++- .../zyclothsample/entity/ZyClothSample.java | 76 ++++--- 7 files changed, 395 insertions(+), 75 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/zyWorkorderManagement/workdep/JSelectProductionDep.vue diff --git a/ant-design-vue-jeecg/src/views/mall/clothSample/ZyClothSampleList.vue b/ant-design-vue-jeecg/src/views/mall/clothSample/ZyClothSampleList.vue index 0f0b9fe1..0104a486 100644 --- a/ant-design-vue-jeecg/src/views/mall/clothSample/ZyClothSampleList.vue +++ b/ant-design-vue-jeecg/src/views/mall/clothSample/ZyClothSampleList.vue @@ -146,32 +146,32 @@ align:"center", dataIndex: 'nums' }, - { - title:'成衣名称', - align:"center", - dataIndex: 'clothName' - }, - { - title:'描述', - align:"center", - dataIndex: 'descr' - }, + // { + // title:'成衣名称', + // align:"center", + // dataIndex: 'clothName' + // }, + // { + // title:'描述', + // align:"center", + // dataIndex: 'descr' + // }, { title:'图片', align:"center", dataIndex: 'url', scopedSlots: {customRender: 'imgSlot'} }, - { - title:'用户', - align:"center", - dataIndex: 'userId' - }, - { - title:'用户类型', - align:"center", - dataIndex: 'type' - }, + // { + // title:'用户', + // align:"center", + // dataIndex: 'userId' + // }, + // { + // title:'用户类型', + // align:"center", + // dataIndex: 'type' + // }, { title: '操作', dataIndex: 'action', diff --git a/ant-design-vue-jeecg/src/views/mall/clothSample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/mall/clothSample/modules/ZyClothSampleForm.vue index f044b220..36ee0827 100644 --- a/ant-design-vue-jeecg/src/views/mall/clothSample/modules/ZyClothSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/mall/clothSample/modules/ZyClothSampleForm.vue @@ -3,36 +3,61 @@ + + + + + + + + + + - - + + + + + + + - + - - + + - - + + + + + + + + + + + + diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue index 5536562f..89ea75bf 100644 --- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue +++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue @@ -155,6 +155,7 @@ + @@ -164,6 +165,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyOrdersModal from '@/views/zyorders/modules/ZyOrdersModal' + import JSelectProductionDep from './workdep/JSelectProductionDep' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import Area from '@/components/_util/Area' import { httpAction, getAction } from '@/api/manage' @@ -172,7 +174,8 @@ name: 'ZyProductionOrderList', mixins:[JeecgListMixin, mixinDevice], components: { - ZyOrdersModal + ZyOrdersModal, + JSelectProductionDep }, data () { return { @@ -376,7 +379,7 @@ deleteBatch: "/zyorders/zyOrders/deleteBatch", exportXlsUrl: "/zyorders/zyOrders/exportXls", importExcelUrl: "zyorders/zyOrders/importExcel", - paidan:"/workorder/workOrder/paidan", + paidan:"/workOrder/workOrder/paidan", }, dictOptions:{}, @@ -395,7 +398,20 @@ }, methods: { paidan(record){ - getAction(this.url.paidan,{id:record.id}).then((res) => { + this.$refs.productionForm.showModal(record.id) + + // getAction(this.url.paidan,{id:record.id}).then((res) => { + // if (res.success) { + // this.$message.success("派单成功！"); + // this.loadData(); + // }else{ + // this.$message.error(res.message); + // } + // }) + }, + paidanFormOk(orderId,depId) { + // 新增/修改 成功时，重载列表 + getAction(this.url.paidan,{'orderId':orderId,'depId':depId}).then((res) => { if (res.success) { this.$message.success("派单成功！"); this.loadData(); diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue index 786379cc..3515ade4 100644 --- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue +++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue @@ -185,11 +185,11 @@ } ], url: { - list: "/workorder/workOrder/workList", - delete: "/workorder/workOrder/delete", - deleteBatch: "/workorder/workOrder/deleteBatch", - exportXlsUrl: "/workorder/workOrder/exportXls", - importExcelUrl: "workorder/workOrder/importExcel", + list: "/workOrder/workOrder/workList", + delete: "/workOrder/workOrder/delete", + deleteBatch: "/workOrder/workOrder/deleteBatch", + exportXlsUrl: "/workOrder/workOrder/exportXls", + importExcelUrl: "workOrder/workOrder/importExcel", }, dictOptions:{}, diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/workdep/JSelectProductionDep.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/workdep/JSelectProductionDep.vue new file mode 100644 index 00000000..9ac09076 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/workdep/JSelectProductionDep.vue @@ -0,0 +1,203 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java index b6184ec5..4a265df2 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java @@ -23,10 +23,14 @@ import org.jeecg.modules.demo.ordergoods.entity.OrderGoods; import org.jeecg.modules.demo.ordergoods.service.IOrderGoodsService; import org.jeecg.modules.demo.zyorders.entity.ZyOrders; import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.workorder.entity.WorkOrder; import org.jeecg.modules.workorder.service.IWorkOrderService; import org.jeecg.modules.workproduct.entity.ZyProduct; import org.jeecg.modules.workproduct.service.IZyProductService; +import org.jeecg.modules.zyclothsample.entity.ZyClothSample; +import org.jeecg.modules.zyclothsample.service.IZyClothSampleService; import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; import org.jeecg.modules.zystylemodel.entity.ZyStyleModel; @@ -84,6 +88,14 @@ public class WorkOrderController extends JeecgController queryPageJSelectPDList(SysDepart sysDepart, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + queryWrapper.eq("org_type",1); + queryWrapper.eq("org_category",2); + IPage pageList = sysDepartService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 派单（讲订单转为工单） * @@ -261,8 +298,8 @@ public class WorkOrderController extends JeecgController paidan(@RequestParam(name="id",required=true) String id,HttpServletRequest req) { - ZyOrders zyOrders = zyOrdersService.getById(id); + public Result paidan(@RequestParam(name="orderId",required=true) String orderId,@RequestParam(name="depId",required=true) String depId,HttpServletRequest req) { + ZyOrders zyOrders = zyOrdersService.getById(orderId); if(zyOrders==null) { return Result.error("未找到对应数据！"); }else{ @@ -273,30 +310,44 @@ public class WorkOrderController extends JeecgController ogWrapper=new QueryWrapper(); - ogWrapper.eq("orders_id",id); + ogWrapper.eq("orders_id",orderId); List ogList=orderGoodsService.list(ogWrapper); if(ogList.size()>0) {//start if 02 // 保存工单 OrderGoods ogModel=ogList.get(0); + //服装款式 //QueryWrapper csWrapper=new QueryWrapper(); ZyClothsStyle csModel=zyClothsStyleService.getById(ogModel.getStyleId()); //服装型号 //QueryWrapper sm=new QueryWrapper(); ZyStyleModel smModel=zyStyleModelService.getById(ogModel.getModelId()); + if(csModel==null ||smModel==null) + { + return Result.error("该订单服装型号或服装款式不存在,请检查后在操作!"); + } + //得到结构图和排排料图 + QueryWrapper csWrapper=new QueryWrapper(); + csWrapper.eq("style_id",ogModel.getStyleId()); + csWrapper.eq("stylemodel_id",ogModel.getModelId()); + List csList=zyClothSampleService.list(csWrapper); +// if(csList.size()<=0) +// { +// return Result.error("商品成衣样板不存在,请检查后在操作!"); +// } +// ZyClothSample cSampleModel=csList.get(0); + int goodNum=ogModel.getGoodsNum(); WorkOrder workOrder=new WorkOrder(); workOrder.setProductCode(CreateWorkCode(csModel.getNums(),smModel.getModelNumber()));//工单编号 - workOrder.setOrdersId(id);//订单id + workOrder.setOrdersId(orderId);//订单id workOrder.setOrderGoodsId(ogModel.getId());// 订单商品 workOrder.setGoodsNum(goodNum);//商品数量 workOrder.setOrderTime(zyOrders.getOrderTime());//下单时间 workOrder.setDeliveryTime(zyOrders.getDeliveryTime());//交货期 workOrder.setWorkOrderStatus(0);//工单状态 - - //暂时存疑 - //workOrder.setEnterprisesId();//企业id + workOrder.setEnterprisesId(depId);//企业id workOrderService.save(workOrder); //保存产品 @@ -307,6 +358,8 @@ public class WorkOrderController extends JeecgController Date: Mon, 9 Jan 2023 15:41:38 +0800 Subject: [PATCH 5/8] 2023-1-9sample --- .../views/zyclothsample/ZyClothSampleList.vue | 2 +- .../modules/ZyClothSampleForm.vue | 14 +++++------ .../device/controller/ZyDeviceController.java | 19 +------------- .../impl/ZyPlanProcessServiceImpl.java | 2 +- .../zyclothsample/entity/ZyClothSample.java | 25 ++++++++++++------- .../controller/ZyDevicebrandController.java | 2 +- .../controller/ZyDevicemodelController.java | 2 +- .../controller/ZyDevicetypeController.java | 2 +- 8 files changed, 29 insertions(+), 39 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue index d3dcca18..139a80d0 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue @@ -217,7 +217,7 @@ export default { { title: '企业', align: "center", - dataIndex: 'userId_dictText' + dataIndex: 'enterpriseId_dictText' }, { title: '创建时间', diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue index cdf42a2e..af5aa95c 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue @@ -5,7 +5,7 @@ - + @@ -152,11 +152,11 @@ export default { }, // kuanshi(){ - this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.userId+"'"; + this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.enterpriseId+"'"; this.model.styleId=null }, xiugai(){ - if(this.model.stylemodelId!=null&&this.model.userId!=null){ + if(this.model.stylemodelId!=null&&this.model.enterpriseId!=null){ this.gaibian() } }, @@ -165,11 +165,11 @@ export default { console.log(this.model) getAction(this.url.sort,this.model).then((res)=>{ console.log(res) - if(this.model.id!=null){ - var num=parseInt(res.result,10) - }else{ + if(this.model.id==null||parseInt(res.result,10)==0){ var num=parseInt(res.result,10)+1 + }else{ + var num=parseInt(res.result,10) } num=num.toString() while(num.length Date: Mon, 9 Jan 2023 17:07:19 +0800 Subject: [PATCH 6/8] 2023-1-9sample --- .../modules/ZyClothSampleForm.vue | 55 ++++++++++++++----- .../controller/ZyClothSampleController.java | 15 ++++- .../zyclothsample/entity/ZyClothSample.java | 4 +- .../mapper/ZyClothSampleMapper.java | 6 ++ .../service/IZyClothSampleService.java | 4 ++ .../impl/ZyClothSampleServiceImpl.java | 10 ++++ .../zystylemodel/entity/ZyStyleModel.java | 3 + 7 files changed, 77 insertions(+), 20 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue index af5aa95c..e5f6f3ba 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue @@ -3,28 +3,47 @@ - - + + + + + + + + - + + + + + + - + + :dictCode="modenumber" @change="gaibian"> + + + + + + @@ -90,7 +109,8 @@ export default { model: { nums:'', }, - dict:"zy_cloths_style,style_names,nums", + dict:"zy_cloths_style,style_names,id", + modenumber:'zy_style_model,model_number,id', labelCol: { xs: {span: 24}, sm: {span: 5}, @@ -152,30 +172,34 @@ export default { }, // kuanshi(){ - this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.enterpriseId+"'"; + this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'"; this.model.styleId=null + this.model.nums=null }, xiugai(){ - if(this.model.stylemodelId!=null&&this.model.enterpriseId!=null){ - this.gaibian() - } + this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'" + this.model.stylemodelId=null + this.model.nums=null + // if(this.model.stylemodelId!=null&&this.model.enterpriseId!=null){ + // this.gaibian() + // } }, gaibian(){ var n=3; console.log(this.model) getAction(this.url.sort,this.model).then((res)=>{ - console.log(res) - if(this.model.id==null||parseInt(res.result,10)==0){ - var num=parseInt(res.result,10)+1 + console.log(res.result[1]) + if(this.model.id==null||parseInt(res.result[1],10)==0){ + var num=parseInt(res.result[1],10)+1 }else{ - var num=parseInt(res.result,10) + var num=parseInt(res.result[1],10) } num=num.toString() while(num.length sort(ZyClothSample zyClothSample) { String s=zyClothSampleService.findSort(zyClothSample.getStyleId(),zyClothSample.getStylemodelId()); + String code=zyClothSampleService.findCode(zyClothSample.getStylemodelId()); + String styleId=zyClothSampleService.findStyleNums(zyClothSample.getStyleId()); + List list=new ArrayList<>(); + list.add(code); + if(s==null){ - return Result.OK(0); - }else - return Result.OK(s.substring(21)); + list.add("0"); + }else{ + list.add(s.substring(21)); + } + list.add(styleId); + return Result.OK(list); } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java index a294e9d6..cc727712 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java @@ -64,12 +64,12 @@ public class ZyClothSample implements Serializable { */ @Excel(name = "款式", width = 15) @ApiModelProperty(value = "款式") - @Dict(dicCode = "nums",dictTable = "zy_cloths_style",dicText = "style_names") + @Dict(dicCode = "id",dictTable = "zy_cloths_style",dicText = "style_names") private String styleId; /**型号*/ @Excel(name = "型号", width = 15) @ApiModelProperty(value = "型号") - @Dict(dicCode = "modenumber", dictTable = "", dicText = "") + @Dict(dicCode = "id", dictTable = "zy_style_model", dicText = "model_number") private String stylemodelId; /**管理模块样板*/ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java index e77c0c66..1951d03f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/mapper/ZyClothSampleMapper.java @@ -18,4 +18,10 @@ public interface ZyClothSampleMapper extends BaseMapper { @Select("select nums from zy_cloth_sample where style_id=#{styleId} and stylemodel_id=#{stylemodelId} order by nums desc limit 0,1") String findSort(@Param("styleId") String styleId, @Param("stylemodelId") String stylemodelId); + + @Select("select model_code from zy_style_model where id=#{stylemodelId}") + String findCode(String stylemodelId); + + @Select("select nums from zy_cloths_style where id=#{styleId}") + String findNums(String styleId); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java index 8c63f4cd..370380bd 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/IZyClothSampleService.java @@ -12,4 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface IZyClothSampleService extends IService { String findSort(String styleId, String stylemodelId); + + String findCode(String stylemodelId); + + String findStyleNums(String styleId); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java index 9752a8f9..2efb511b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/service/impl/ZyClothSampleServiceImpl.java @@ -23,4 +23,14 @@ public class ZyClothSampleServiceImpl extends ServiceImpl Date: Mon, 9 Jan 2023 17:15:06 +0800 Subject: [PATCH 7/8] =?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 8/8] =?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 { + +}