From 07f0c8af85fdd746531cae2b1110b569f1e04f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Sat, 7 Jan 2023 16:12:54 +0800 Subject: [PATCH] 2023-01-07-02 --- .../src/views/activiti/doneManage.vue | 2 +- .../views/activiti/processFinishManage.vue | 4 +- .../src/views/activiti/processInsManage.vue | 4 +- .../src/views/activiti/todoManage.vue | 2 +- .../src/views/jeecg/SelectDemo.vue | 2 +- .../tablist/form/JeecgOrderCustomerModal.vue | 2 +- .../src/views/personel/ZyDistributionList.vue | 2 +- .../process/modules/ZyOperationtoolModal.vue | 2 +- .../modules/ZyProcessAccessoriesModal.vue | 2 +- .../process/modules/ZyProcessFabricModal.vue | 2 +- .../process/modules/ZyProcessMachineModal.vue | 2 +- .../src/views/system/UserAnnouncementList.vue | 2 +- .../src/views/system/modules/StaffModal.vue | 2 +- .../src/views/workorder/WorkOrderList.vue | 103 +++--- .../views/workorder/modules/WorkOrderForm.vue | 137 +++----- .../modules/WorkOrderModal__Style#Drawer.vue | 1 + .../src/views/zyWorkProduct/ZyProductList.vue | 318 ++++++++++++++++++ .../zyWorkProduct/modules/ZyProductForm.vue | 224 ++++++++++++ .../zyWorkProduct/modules/ZyProductModal.vue | 8 +- .../modules/ZyProductModal__Style#Drawer.vue | 9 +- ...dersList.vue => ZyProductionOrderList.vue} | 109 +++--- .../zyWorkorderManagement/ZyWorkOrderList.vue | 64 ++-- .../modules/ZyStyleAccessoriesModal.vue | 2 +- .../modules/ZyStyleFabricModal.vue | 2 +- .../modules/ZyStyleModularModal.vue | 2 +- .../modules/ZyStyleModuleModal.vue | 2 +- .../controller/WorkOrderController.java | 244 +++++++++++++- .../modules/workorder/entity/WorkOrder.java | 77 +++-- .../workorder/mapper/WorkOrderMapper.java | 4 +- .../workorder/service/IWorkOrderService.java | 5 +- .../service/impl/WorkOrderServiceImpl.java | 3 +- .../workorder/vue/modules/WorkOrderForm.vue | 186 ---------- .../controller/ZyProductController.java | 171 ++++++++++ .../modules/workproduct/entity/ZyProduct.java | 157 +++++++++ .../workproduct/mapper/ZyProductMapper.java | 17 + .../mapper/xml/ZyProductMapper.xml | 5 + .../service/IZyProductService.java | 14 + .../service/impl/ZyProductServiceImpl.java | 19 ++ 38 files changed, 1416 insertions(+), 497 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue create mode 100644 ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductForm.vue rename jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderModal.vue => ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal.vue (83%) rename jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderModal__Style#Drawer.vue => ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal__Style#Drawer.vue (87%) rename ant-design-vue-jeecg/src/views/zyWorkorderManagement/{ZyOrdersList.vue => ZyProductionOrderList.vue} (86%) rename jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/WorkOrderList.vue => ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue (82%) delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderForm.vue create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/controller/ZyProductController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/ZyProductMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/xml/ZyProductMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/IZyProductService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/impl/ZyProductServiceImpl.java diff --git a/ant-design-vue-jeecg/src/views/activiti/doneManage.vue b/ant-design-vue-jeecg/src/views/activiti/doneManage.vue index fcd423a9..1205d110 100644 --- a/ant-design-vue-jeecg/src/views/activiti/doneManage.vue +++ b/ant-design-vue-jeecg/src/views/activiti/doneManage.vue @@ -125,7 +125,7 @@ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderModal__Style#Drawer.vue index 54a756f7..8b394962 100644 --- a/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderModal__Style#Drawer.vue +++ b/ant-design-vue-jeecg/src/views/workorder/modules/WorkOrderModal__Style#Drawer.vue @@ -5,6 +5,7 @@ placement="right" :closable="false" @close="close" + destroyOnClose :visible="visible">
diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue new file mode 100644 index 00000000..cf817114 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue @@ -0,0 +1,318 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductForm.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductForm.vue new file mode 100644 index 00000000..0252e547 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductForm.vue @@ -0,0 +1,224 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderModal.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal.vue similarity index 83% rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderModal.vue rename to ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal.vue index cd202439..40628c4d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/vue/modules/WorkOrderModal.vue +++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/modules/ZyProductModal.vue @@ -8,17 +8,17 @@ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @cancel="handleCancel" cancelText="关闭"> - + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/controller/ZyProductController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/controller/ZyProductController.java new file mode 100644 index 00000000..5b0e085a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/controller/ZyProductController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.workproduct.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 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.jeecg.modules.workproduct.entity.ZyProduct; +import org.jeecg.modules.workproduct.service.IZyProductService; +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("/zyproduct/zyProduct") +@Slf4j +public class ZyProductController extends JeecgController { + @Autowired + private IZyProductService zyProductService; + + /** + * 分页列表查询 + * + * @param zyProduct + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "产品表-分页列表查询") + @ApiOperation(value="产品表-分页列表查询", notes="产品表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyProduct zyProduct, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProduct, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProductService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyProduct + * @return + */ + @AutoLog(value = "产品表-添加") + @ApiOperation(value="产品表-添加", notes="产品表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyProduct zyProduct) { + zyProductService.save(zyProduct); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyProduct + * @return + */ + @AutoLog(value = "产品表-编辑") + @ApiOperation(value="产品表-编辑", notes="产品表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyProduct zyProduct) { + zyProductService.updateById(zyProduct); + 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) { + zyProductService.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.zyProductService.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) { + ZyProduct zyProduct = zyProductService.getById(id); + if(zyProduct==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyProduct); + } + + /** + * 导出excel + * + * @param request + * @param zyProduct + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyProduct zyProduct) { + return super.exportXls(request, zyProduct, ZyProduct.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, ZyProduct.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java new file mode 100644 index 00000000..72b95bd3 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java @@ -0,0 +1,157 @@ +package org.jeecg.modules.workproduct.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("zy_product") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_product对象", description="产品表") +public class ZyProduct 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) + @ApiModelProperty(value = "产品编号") + private String productCode; + /**工单*/ + @Excel(name = "工单", width = 15) + @ApiModelProperty(value = "工单") + private String workOrderId; + /**生产时间*/ + @Excel(name = "生产时间", width = 15) + @ApiModelProperty(value = "生产时间") + private Integer produceTime; + /**合计（手工TMU）*/ + @Excel(name = "合计（手工TMU）", width = 15) + @ApiModelProperty(value = "合计（手工TMU）") + private Double totalManualTmu; + /**合计（设备TMU）*/ + @Excel(name = "合计（设备TMU）", width = 15) + @ApiModelProperty(value = "合计（设备TMU）") + private Double totalMachineTmu; + /**合计（手工秒）*/ + @Excel(name = "合计（手工秒）", width = 15) + @ApiModelProperty(value = "合计（手工秒）") + private Integer totalMaunal; + /**合计（设备秒）*/ + @Excel(name = "合计（设备秒）", width = 15) + @ApiModelProperty(value = "合计（设备秒）") + private Integer totalMachine; + /**企业*/ + @Excel(name = "企业", width = 15) + @ApiModelProperty(value = "企业") + private String enterprisesId; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private String userId; + /**结构图*/ + @Excel(name = "结构图", width = 15) + @ApiModelProperty(value = "结构图") + private String structureDiagram; + /**排料图*/ + @Excel(name = "排料图", width = 15) + @ApiModelProperty(value = "排料图") + private String layoutDiagram; + /**产品图片*/ + @Excel(name = "产品图片", width = 15) + @ApiModelProperty(value = "产品图片") + private String productPicture; + /**身高*/ + @Excel(name = "身高", width = 15) + @ApiModelProperty(value = "身高") + private Double height; + /**体重*/ + @Excel(name = "体重", width = 15) + @ApiModelProperty(value = "体重") + private Double weight; + /**下摆*/ + @Excel(name = "下摆", width = 15) + @ApiModelProperty(value = "下摆") + private Double hem; + /**袖口*/ + @Excel(name = "袖口", width = 15) + @ApiModelProperty(value = "袖口") + private Double cuff; + /**袖长*/ + @Excel(name = "袖长", width = 15) + @ApiModelProperty(value = "袖长") + private Double sleeveLength; + /**胸围*/ + @Excel(name = "胸围", width = 15) + @ApiModelProperty(value = "胸围") + private Double bust; + /**腰围*/ + @Excel(name = "腰围", width = 15) + @ApiModelProperty(value = "腰围") + private Double theWaist; + /**肩宽*/ + @Excel(name = "肩宽", width = 15) + @ApiModelProperty(value = "肩宽") + private Double shoulderwidth; + /**前身长*/ + @Excel(name = "前身长", width = 15) + @ApiModelProperty(value = "前身长") + private Double forebodylength; + /**领围*/ + @Excel(name = "领围", width = 15) + @ApiModelProperty(value = "领围") + private Double neck; + /**臀围*/ + @Excel(name = "臀围", width = 15) + @ApiModelProperty(value = "臀围") + private Double hipline; + /**衣长*/ + @Excel(name = "衣长", width = 15) + @ApiModelProperty(value = "衣长") + private Double length; + /**胸距*/ + @Excel(name = "胸距", width = 15) + @ApiModelProperty(value = "胸距") + private Double sternalDistance; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/ZyProductMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/ZyProductMapper.java new file mode 100644 index 00000000..0a166b9a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/ZyProductMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.workproduct.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.workproduct.entity.ZyProduct; + +/** + * @Description: 产品表 + * @Author: jeecg-boot + * @Date: 2023-01-07 + * @Version: V1.0 + */ +public interface ZyProductMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/xml/ZyProductMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/xml/ZyProductMapper.xml new file mode 100644 index 00000000..a4727bae --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/mapper/xml/ZyProductMapper.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/workproduct/service/IZyProductService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/IZyProductService.java new file mode 100644 index 00000000..ef03e365 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/IZyProductService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.workproduct.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.workproduct.entity.ZyProduct; + +/** + * @Description: 产品表 + * @Author: jeecg-boot + * @Date: 2023-01-07 + * @Version: V1.0 + */ +public interface IZyProductService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/impl/ZyProductServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/impl/ZyProductServiceImpl.java new file mode 100644 index 00000000..058309c7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/service/impl/ZyProductServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.workproduct.service.impl; + +import org.jeecg.modules.workproduct.entity.ZyProduct; +import org.jeecg.modules.workproduct.mapper.ZyProductMapper; +import org.jeecg.modules.workproduct.service.IZyProductService; +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 ZyProductServiceImpl extends ServiceImpl implements IZyProductService { + +}