2022-09-07 接口

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java

@@ -13,6 +13,8 @@ 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.base.entity.ZyClothsComponent;
+import org.jeecg.modules.demo.base.entity.ZyClothsModular;
+import org.jeecg.modules.demo.base.entity.ZyClothsType;
 import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
 import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
 
@@ -21,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.base.service.IZyClothsModularService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,6 +53,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyClothsComponentController extends JeecgController<ZyClothsComponent, IZyClothsComponentService> {
 	@Autowired
 	private IZyClothsComponentService zyClothsComponentService;
+	 @Autowired
+	 private IZyClothsModularService zyClothsModularService;
 
 	/**
 	 * 分页列表查询
@@ -73,6 +78,22 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
 		return Result.OK(pageList);
 	}
 
+	 @AutoLog(value = "zy_cloths_component-查询所有")
+	 @ApiOperation(value="zy_cloths_component-查询所有", notes="zy_cloths_component-查询所有")
+	 @GetMapping(value = "/findAll")
+	 public Result<?> findAll() {
+		 List<ZyClothsComponent> list = zyClothsComponentService.list();
+
+		 for(ZyClothsComponent zycl : list){
+			 String id = zycl.getModularId();
+			 String enterpriseId = zycl.getEnterpriseId();
+			 if(id!=null && enterpriseId !=null){
+				 ZyClothsModular byId = zyClothsModularService.getById(id);
+				 zycl.setModularId(byId.getModularName());
+			 }
+		 }
+		 return Result.OK(list);
+	 }
 	/**
 	 *   添加
 	 *

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java

@@ -13,6 +13,7 @@ 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.base.entity.ZyClothsModular;
+import org.jeecg.modules.demo.base.entity.ZyClothsType;
 import org.jeecg.modules.demo.base.service.IZyClothsModularService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -49,6 +51,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyClothsModularController extends JeecgController<ZyClothsModular, IZyClothsModularService> {
 	@Autowired
 	private IZyClothsModularService zyClothsModularService;
+	 @Autowired
+	 private IZyClothsTypeService zyClothsTypeService;
+
 
 	/**
 	 * 分页列表查询
@@ -72,6 +77,22 @@ public class ZyClothsModularController extends JeecgController<ZyClothsModular,
 		return Result.OK(pageList);
 	}
 
+	 @AutoLog(value = "zy_cloths_modular-查询所有")
+	 @ApiOperation(value="zy_cloths_modular-查询所有", notes="zy_cloths_modular-查询所有")
+	 @GetMapping(value = "/findAll")
+	 public Result<?> findAll() {
+		 List<ZyClothsModular> list = zyClothsModularService.list();
+		 for(ZyClothsModular zycl : list){
+			 String id = zycl.getClothsTypeId();
+			 if(id!=null){
+				 ZyClothsType byId = zyClothsTypeService.getById(id);
+				 zycl.setClothsTypeId(byId.getTypeName());
+			 }
+
+		 }
+		 return Result.OK(list);
+	 }
+
 	/**
 	 *   添加
 	 *

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.demo.pro.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -12,6 +13,11 @@ 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.base.entity.ZyClothsComponent;
+import org.jeecg.modules.demo.base.entity.ZyProcess;
+import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
+import org.jeecg.modules.demo.base.service.IZyProcessService;
+import org.jeecg.modules.demo.pro.entity.NewZyProcessComponent;
 import org.jeecg.modules.demo.pro.entity.ZyProcessComponent;
 import org.jeecg.modules.demo.pro.service.IZyProcessComponentService;
 
@@ -49,6 +55,10 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyProcessComponentController extends JeecgController<ZyProcessComponent, IZyProcessComponentService> {
 	@Autowired
 	private IZyProcessComponentService zyProcessComponentService;
+	 @Autowired
+	 private IZyProcessService zyProcessService;
+	 @Autowired
+	 private IZyClothsComponentService zyClothsComponentService;
 
 	/**
 	 * 分页列表查询
@@ -72,6 +82,51 @@ public class ZyProcessComponentController extends JeecgController<ZyProcessCompo
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  *
+	  */
+	 @AutoLog(value = "zy_process_component-查询所有")
+	 @ApiOperation(value="zy_process_component-查询所有", notes="zy_process_component-查询所有")
+	 @GetMapping(value = "/findAll")
+	 public Result<?> findAll() {
+		 List<ZyProcessComponent> list = zyProcessComponentService.list();
+		 List<NewZyProcessComponent> list1 = new ArrayList<>();
+		 for (ZyProcessComponent zy : list){
+			 NewZyProcessComponent newZy = new NewZyProcessComponent();
+			 String processId = zy.getProcessId();
+			 String componentId = zy.getComponentId();
+			 ZyProcess byId = zyProcessService.getById(processId);
+			 ZyClothsComponent byId1 = zyClothsComponentService.getById(componentId);
+			 newZy.setProcessCode(byId.getProcessCode());
+			 newZy.setProcessName(byId.getProcessName());
+			 newZy.setProcessDescribe(byId.getProcessDescribe());
+			 newZy.setMkExplain(byId.getMkExplain());
+			 newZy.setQualityRequire(byId.getQualityRequire());
+			 newZy.setProcessTime(byId.getProcessTime());
+			 newZy.setPrice(byId.getPrice());
+			 newZy.setGrade(byId.getGrade());
+			 newZy.setNeedlePitch(byId.getNeedlePitch());
+			 newZy.setManualTime(byId.getManualTime());
+			 newZy.setMachineSpeed(byId.getMachineSpeed());
+			 newZy.setMachineWide(byId.getMachineWide());
+			 newZy.setMachineTime(byId.getMachineTime());
+			 newZy.setMachineFloat(byId.getMachineFloat());
+			 newZy.setBundleWide(byId.getBundleWide());
+			 newZy.setBundleTime(byId.getBundleTime());
+			 newZy.setEnterpriseId(byId.getEnterpriseId());
+			 newZy.setStyleId(byId.getStyleId());
+			 newZy.setWorksectionCode(byId.getWorksectionCode());
+			 newZy.setTotalManualTmu(byId.getTotalManualTmu());
+			 newZy.setTotalMachineTmu(byId.getTotalMachineTmu());
+			 newZy.setTotalMaunal(byId.getTotalMaunal());
+			 newZy.setTotalMachine(byId.getTotalMachine());
+			 newZy.setNums(byId1.getNums());
+			 newZy.setPartsName(byId1.getPartsName());
+			 newZy.setDescription(byId1.getDescription());
+			 list1.add(newZy);
+		 }
+		 return Result.OK(list1);
+	 }
 	/**
 	 *   添加
 	 *

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/NewZyProcessComponent.java

@@ -0,0 +1,136 @@
+package org.jeecg.modules.demo.pro.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.demo.base.entity.vo.ZyClothActionVo;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.List;
+
+@Data
+public class NewZyProcessComponent {
+    /**工序代码*/
+    @Excel(name = "工序代码", width = 15)
+    @ApiModelProperty(value = "工序代码")
+    private java.lang.String processCode;
+    /**工序名称*/
+    @Excel(name = "工序名称", width = 15)
+    @ApiModelProperty(value = "工序名称")
+    private java.lang.String processName;
+    /**工艺描述*/
+    @Excel(name = "工艺描述", width = 15)
+    @ApiModelProperty(value = "工艺描述")
+    private java.lang.String processDescribe;
+    /**做工说明*/
+    @Excel(name = "做工说明", width = 15)
+    @ApiModelProperty(value = "做工说明")
+    private java.lang.String mkExplain;
+    /**品质要求*/
+    @Excel(name = "品质要求", width = 15)
+    @ApiModelProperty(value = "品质要求")
+    private java.lang.String qualityRequire;
+    /**工序时间*/
+    @Excel(name = "工序时间", width = 15)
+    @ApiModelProperty(value = "工序时间")
+    private java.lang.String processTime;
+    /**工序单价*/
+    @Excel(name = "工序单价", width = 15)
+    @ApiModelProperty(value = "工序单价")
+    private java.lang.Double price;
+    /**工序等级*/
+    @Excel(name = "工序等级", width = 15)
+    @ApiModelProperty(value = "工序等级")
+    private java.lang.String grade;
+    /**针距（针/厘米）*/
+    @Excel(name = "针距（针/厘米）", width = 15)
+    @ApiModelProperty(value = "针距（针/厘米）")
+    private java.lang.Integer needlePitch;
+    /**手工宽放*/
+    @Excel(name = "手工宽放", width = 15)
+    @ApiModelProperty(value = "手工宽放")
+    private java.lang.String manualWide;
+    /**手工时间*/
+    @Excel(name = "手工时间", width = 15)
+    @ApiModelProperty(value = "手工时间")
+    private java.lang.Double manualTime;
+    /**机器转速*/
+    @Excel(name = "机器转速", width = 15)
+    @ApiModelProperty(value = "机器转速")
+    private java.lang.Integer machineSpeed;
+    /**机器宽放*/
+    @Excel(name = "机器宽放", width = 15)
+    @ApiModelProperty(value = "机器宽放")
+    private java.lang.String machineWide;
+    /**机器时间*/
+    @Excel(name = "机器时间", width = 15)
+    @ApiModelProperty(value = "机器时间")
+    private java.lang.Double machineTime;
+    /**机器浮于*/
+    @Excel(name = "机器浮于", width = 15)
+    @ApiModelProperty(value = "机器浮于")
+    private java.lang.String machineFloat;
+    /**绑包宽放*/
+    @Excel(name = "绑包宽放", width = 15)
+    @ApiModelProperty(value = "绑包宽放")
+    private java.lang.String bundleWide;
+    /**绑包时间*/
+    @Excel(name = "绑包时间", width = 15)
+    @ApiModelProperty(value = "绑包时间")
+    private java.lang.String bundleTime;
+    /**企业名称*/
+    @Excel(name = "企业名称", width = 15)
+    @ApiModelProperty(value = "企业名称")
+    private java.lang.String enterpriseId;
+    /**工具名称*/
+    /**款式名称*/
+    @Excel(name = "款式名称", width = 15)
+    @ApiModelProperty(value = "款式名称")
+    private java.lang.String styleId;
+    /**工段代码*/
+    @Excel(name = "工段代码", width = 15)
+    @ApiModelProperty(value = "工段代码")
+    private java.lang.String worksectionCode;
+
+    /**合计（手工TMU）*/
+    @Excel(name = "合计（手工TMU）", width = 15)
+    @ApiModelProperty(value = "合计（手工TMU）")
+    private java.lang.Integer totalManualTmu;
+    /**合计（机器TMU）*/
+    @Excel(name = "合计（机器TMU）", width = 15)
+    @ApiModelProperty(value = "合计（机器TMU）")
+    private java.lang.Integer totalMachineTmu;
+    /**合计（手工秒）*/
+    @Excel(name = "合计（手工秒）", width = 15)
+    @ApiModelProperty(value = "合计（手工秒）")
+    private java.lang.Integer totalMaunal;
+    /**合计（机器秒）*/
+    @Excel(name = "合计（机器秒）", width = 15)
+    @ApiModelProperty(value = "合计（机器秒）")
+    private java.lang.Integer totalMachine;
+
+
+    /**编号*/
+    @Excel(name = "编号", width = 15)
+    @ApiModelProperty(value = "编号")
+    private java.lang.String nums;
+    /**部件名称*/
+    @Excel(name = "部件名称", width = 15)
+    @ApiModelProperty(value = "部件名称")
+    private java.lang.String partsName;
+    /**描述*/
+    @Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String description;
+
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.zyclothsstyle.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +19,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
+import org.jeecg.modules.demo.base.entity.ZyClothsModular;
+import org.jeecg.modules.demo.base.entity.ZyClothsType;
+import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
+import org.jeecg.modules.demo.base.service.IZyClothsModularService;
+import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
+import org.jeecg.modules.demo.pro.entity.NewZyProcessComponent;
+import org.jeecg.modules.demo.pro.entity.ZyProcessComponent;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
 import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -49,6 +60,15 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyClothsStyleService> {
 	@Autowired
 	private IZyClothsStyleService zyClothsStyleService;
+	 @Autowired
+	 private IZyClothsComponentService zyClothsComponentService;
+
+	 @Autowired
+	 private ISysDepartService sysDepartService;
+	 @Autowired
+	 private IZyClothsModularService zyClothsModularService;
+	 @Autowired
+	 private IZyClothsTypeService zyClothsTypeService;
 
 	/**
 	 * 分页列表查询
@@ -72,6 +92,60 @@ public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyC
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "服装款式表-查询所有")
+	 @ApiOperation(value="服装款式表-查询所有", notes="服装款式表-查询所有")
+	 @GetMapping(value = "/findAll")
+	 public Result<?> findAll() {
+		 List<ZyClothsStyle> list = zyClothsStyleService.list();
+
+		 for(ZyClothsStyle zycl : list){
+			 String id = zycl.getEnterpriseId();
+			 if(id != null){
+				 SysDepart byId = sysDepartService.getById(id);
+				 zycl.setEnterpriseId(byId.getDepartName());
+			 }
+		 }
+		 return Result.OK(list);
+	 }
+
+	 /**
+	  * 制衣部件
+	  * @return
+	  */
+	 @AutoLog(value = "服装款式表-制衣部件查询所有")
+	 @ApiOperation(value="服装款式表-制衣部件查询所有", notes="服装款式表-制衣部件查询所有")
+	 @GetMapping(value = "/cloCfindAll")
+	 public Result<?> cloCfindAll() {
+		 List<ZyClothsComponent> list = zyClothsComponentService.list();
+
+		 for(ZyClothsComponent zycl : list){
+
+			 String id = zycl.getModularId();
+			 String enterpriseId = zycl.getEnterpriseId();
+			 /*if(id!=null || (enterpriseId !=null&&enterpriseId.isEmpty())){
+				 ZyClothsType byId = zyClothsTypeService.getById(id);
+				 SysDepart byId1 = sysDepartService.getById(enterpriseId);
+				 zycl.setClothsTypeId(byId.getTypeName());
+				 zycl.setEnterpriseId(byId1.getDepartName());
+			 }*/
+			 if(id!=null){
+				 ZyClothsModular byId = zyClothsModularService.getById(id);
+				 zycl.setModularId(byId.getModularName());
+			 }
+		 }
+		  /*if(id!=null || (enterpriseId !=null&&enterpriseId.isEmpty())){
+				 ZyClothsType byId = zyClothsTypeService.getById(id);
+				 SysDepart byId1 = sysDepartService.getById(enterpriseId);
+				 zycl.setClothsTypeId(byId.getTypeName());
+				 zycl.setEnterpriseId(byId1.getDepartName());
+			 }*/
+		 return Result.OK(list);
+
+	 }
 	/**
 	 *   添加
 	 *