新增
导出
+
返回
diff --git a/ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue b/ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue
index a745e871..5975b44c 100644
--- a/ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue
+++ b/ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue
@@ -30,7 +30,7 @@
import { httpAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
- import { Print } from 'vue-print-nb'
+ import { Print } from 'vue-print-nb-jeecg'
export default {
name: "QRCode",
components: {
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
index 1d5bb51b..7d468284 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
@@ -67,8 +67,8 @@ public class ZyAccessoriesController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyAccessories, req.getParameterMap());
- QueryWrapper queryWrapper = new QueryWrapper();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyAccessories, req.getParameterMap());
+// QueryWrapper queryWrapper = new QueryWrapper();
Page page = new Page(pageNo, pageSize);
IPage pageList = zyAccessoriesService.page(page, queryWrapper);
return Result.OK(pageList);
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
index 4d6992c1..72f93fe4 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
@@ -66,8 +66,8 @@ public class ZyAccessoriesTypeController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyAccessoriesType, req.getParameterMap());
- QueryWrapper queryWrapper = new QueryWrapper();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyAccessoriesType, req.getParameterMap());
+// QueryWrapper queryWrapper = new QueryWrapper();
Page page = new Page(pageNo, pageSize);
IPage pageList = zyAccessoriesTypeService.page(page, queryWrapper);
return Result.OK(pageList);
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
index 258decea..5c7caa1c 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
@@ -67,6 +67,7 @@ public class ZyAccessories implements Serializable {
/**供货商信息*/
@Excel(name = "供货商信息", width = 15)
@ApiModelProperty(value = "供货商信息")
+ @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private java.lang.String supplierInfo;
/**创建人*/
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
index 5440da7a..06e45492 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
@@ -60,6 +60,13 @@ public class ZyClothsTypeController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
Page page = new Page(pageNo, pageSize);
IPage pageList = zyClothsTypeService.page(page, queryWrapper);
+ List records = pageList.getRecords();
+ for (ZyClothsType zy : records) {
+ String typeId = zy.getTypeId();
+ if (StringUtils.isEmpty(typeId)){
+ zy.setTypeId("1455487094925819901");
+ }
+ }
return Result.OK(pageList);
}
@@ -96,7 +103,7 @@ public class ZyClothsTypeController extends JeecgController weiyi() {
+ String a=zyClothsTypeService.sort();
+ if(a==null){
+ return Result.OK("0");
+ }
+ return Result.OK(a.substring(4));
+ }
+
+
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
index 7ebf1bd1..f485abab 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.base.entity.ZyClothsType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,4 +18,7 @@ public interface ZyClothsTypeMapper extends BaseMapper {
List selectNumsList();
List listByTypeId(String typeId);
+
+ @Select("select nums from zy_cloths_type where nums like 'QIYE%' order by nums desc limit 0,1 ")
+ String sort();
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
index 0f1b4359..5f17c12d 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsTypeService.java
@@ -13,4 +13,6 @@ public interface IZyClothsTypeService extends IService {
/**nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）*/
String generateNumber();
+
+ String sort();
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
index 265a785b..ee8a39ab 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
@@ -40,6 +40,15 @@ public class ZyClothsTypeServiceImpl extends ServiceImpl listString = zyClothsTypeMapper.selectNumsList();
//System.out.println(listString);
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
index 7b9c6d07..9f57d9e5 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java
@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface ZyProcessActionMapper extends BaseMapper {
@Select("")
IPage page(Page page, @Param("p") String s, @Param("m") String t);
- @Select("")
+ @Select("")
IPage page1(Page page, @Param("p") String s, @Param("m") String t);
@Select("select * from zy_cloth_action where id in (select action_id from zy_process_action where process_id=#{id}) ")
List selectByid(String id);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
index 9cd8c77d..d7a07dad 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
@@ -9,8 +9,11 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice;
import org.jeecg.modules.demo.customerinvoice.service.ICustomerInvoiceService;
@@ -49,7 +52,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class CustomerInvoiceController extends JeecgController {
@Autowired
private ICustomerInvoiceService customerInvoiceService;
-
+
/**
* 分页列表查询
*
@@ -71,7 +74,35 @@ public class CustomerInvoiceController extends JeecgController pageList = customerInvoiceService.page(page, queryWrapper);
return Result.OK(pageList);
}
-
+
+
+
+ /**
+ * 分页列表查询
+ *
+ * @param customerInvoice
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "客户发票信息-分页列表查询")
+ @ApiOperation(value="客户发票信息-分页列表查询", notes="客户发票信息-分页列表查询")
+ @GetMapping(value = "/listcustom")
+ public Result listcustom(CustomerInvoice customerInvoice,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerInvoice, req.getParameterMap());
+ queryWrapper.eq("createBy",sysUser.getUsername());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = customerInvoiceService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+
+
/**
* 添加
*
@@ -85,7 +116,7 @@ public class CustomerInvoiceController extends JeecgController {
@Autowired
private ICustomerMeasureService customerMeasureService;
-
+
/**
* 分页列表查询
*
@@ -71,8 +74,36 @@ public class CustomerMeasureController extends JeecgController pageList = customerMeasureService.page(page, queryWrapper);
return Result.OK(pageList);
}
-
- /**
+
+
+
+ /**
+ * 分页列表查询
+ *
+ * @param customerMeasure
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "顾客测体管理-分页列表查询")
+ @ApiOperation(value="顾客测体管理-分页列表查询", notes="顾客测体管理-分页列表查询")
+ @GetMapping(value = "/listcustom")
+ public Result listcustom(CustomerMeasure customerMeasure,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerMeasure, req.getParameterMap());
+ queryWrapper.eq("createBy",sysUser.getUsername());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = customerMeasureService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+
+
+ /**
* 添加
*
* @param customerMeasure
@@ -85,7 +116,7 @@ public class CustomerMeasureController extends JeecgController {
@Autowired
private ICustomerPaymentService customerPaymentService;
-
+
/**
* 分页列表查询
*
@@ -71,7 +74,33 @@ public class CustomerPaymentController extends JeecgController pageList = customerPaymentService.page(page, queryWrapper);
return Result.OK(pageList);
}
-
+
+
+ /**
+ * 分页列表查询
+ *
+ * @param customerPayment
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "顾客支付信息管理-分页列表查询")
+ @ApiOperation(value="顾客支付信息管理-分页列表查询", notes="顾客支付信息管理-分页列表查询")
+ @GetMapping(value = "/listcustom")
+ public Result listcustom(CustomerPayment customerPayment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerPayment, req.getParameterMap());
+ queryWrapper.eq("createBy",sysUser.getUsername());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = customerPaymentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+
/**
* 添加
*
@@ -85,7 +114,7 @@ public class CustomerPaymentController extends JeecgController listcustom(CustomerReceivingAddress customerReceivingAddress,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerReceivingAddress, req.getParameterMap());
+ queryWrapper.eq("createBy",sysUser.getUsername());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = customerReceivingAddressService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+
+
/**
* 添加
*
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customershoppingcart/controller/CustomerShoppingCartController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customershoppingcart/controller/CustomerShoppingCartController.java
index a0413e49..8646d666 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customershoppingcart/controller/CustomerShoppingCartController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customershoppingcart/controller/CustomerShoppingCartController.java
@@ -9,8 +9,11 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.customershoppingcart.entity.CustomerShoppingCart;
import org.jeecg.modules.demo.customershoppingcart.service.ICustomerShoppingCartService;
@@ -77,6 +80,34 @@ public class CustomerShoppingCartController extends JeecgController listcust(CustomerShoppingCart customerShoppingCart,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerShoppingCart, req.getParameterMap());
+ queryWrapper.eq("createBy",sysUser.getUsername());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = customerShoppingCartService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+
+
/**
* 添加
*
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/controller/ZyProductProcessController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/controller/ZyProductProcessController.java
new file mode 100644
index 00000000..ab701e08
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/controller/ZyProductProcessController.java
@@ -0,0 +1,202 @@
+package org.jeecg.modules.product.zyproductprocess.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.product.zyproductprocess.entity.ZyProductProcess;
+import org.jeecg.modules.product.zyproductprocess.service.IZyProductProcessService;
+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: 2022-12-14
+ * @Version: V1.0
+ */
+@Api(tags="产品工序")
+@RestController
+@RequestMapping("/zyproductprocess/zyProductProcess")
+@Slf4j
+public class ZyProductProcessController extends JeecgController {
+ @Autowired
+ private IZyProductProcessService zyProductProcessService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param zyProductProcess
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "产品工序-分页列表查询")
+ @ApiOperation(value="产品工序-分页列表查询", notes="产品工序-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(ZyProductProcess zyProductProcess,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProductProcess, req.getParameterMap());
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.orderByDesc("number");
+ queryWrapper.eq("product_id",zyProductProcess.getProductId());
+ if(zyProductProcess.getProcessId()!=null&&!zyProductProcess.getProcessId().equals("")){
+ String s="%"+zyProductProcess.getProcessId()+"%";
+ List list=zyProductProcessService.find(s);
+ queryWrapper.in("process_id",list);
+ }
+
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = zyProductProcessService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param zyProductProcess
+ * @return
+ */
+ @AutoLog(value = "产品工序-添加")
+ @ApiOperation(value="产品工序-添加", notes="产品工序-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyProductProcess zyProductProcess) {
+ String[] split = zyProductProcess.getProcessId().split(",");
+ for (String k : split) {
+ zyProductProcess.setProcessId(k);
+ QueryWrapper s=new QueryWrapper();
+ s.eq("product_id",zyProductProcess.getProductId());
+ s.eq("process_id",zyProductProcess.getProcessId());
+ int a=zyProductProcessService.count(s);
+ if(a==0)
+ zyProductProcessService.save(zyProductProcess);
+ zyProductProcess.setId(null);
+ }
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param zyProductProcess
+ * @return
+ */
+ @AutoLog(value = "产品工序-编辑")
+ @ApiOperation(value="产品工序-编辑", notes="产品工序-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@RequestBody ZyProductProcess zyProductProcess) {
+ zyProductProcessService.updateById(zyProductProcess);
+ 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) {
+ zyProductProcessService.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.zyProductProcessService.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) {
+ ZyProductProcess zyProductProcess = zyProductProcessService.getById(id);
+ if(zyProductProcess==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyProductProcess);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param zyProductProcess
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ZyProductProcess zyProductProcess) {
+ return super.exportXls(request, zyProductProcess, ZyProductProcess.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, ZyProductProcess.class);
+ }
+
+ @GetMapping(value = "/up")
+ public Result up(@RequestParam(name="id",required=true) String id) {
+ zyProductProcessService.up(id);
+ return Result.OK("升序成功");
+ }
+ @GetMapping(value = "/down")
+ public Result down(@RequestParam(name="id",required=true) String id) {
+ ZyProductProcess zyProductProcess = zyProductProcessService.getById(id);
+ if(zyProductProcess==null||zyProductProcess.getNumber()==0)
+ return Result.error("当前以是最低级别！！");
+ zyProductProcessService.down(id);
+ return Result.OK("降序成功");
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/entity/ZyProductProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/entity/ZyProductProcess.java
new file mode 100644
index 00000000..2e8b9098
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/entity/ZyProductProcess.java
@@ -0,0 +1,70 @@
+package org.jeecg.modules.product.zyproductprocess.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: 2022-12-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_product_process")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="zy_product_process对象", description="产品工序")
+public class ZyProductProcess 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;
+ /**产品id*/
+ @Excel(name = "产品id", width = 15)
+ @ApiModelProperty(value = "产品id")
+// @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有，需要后期打开
+ private String productId;
+ /**工序id*/
+ @Excel(name = "工序id", width = 15)
+ @ApiModelProperty(value = "工序id")
+ @Dict(dictTable = "zy_process",dicText = "process_name",dicCode = "id")
+ private String processId;
+ /**序号*/
+ @Excel(name = "序号", width = 15)
+ @ApiModelProperty(value = "序号")
+ private Integer number;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/ZyProductProcessMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/ZyProductProcessMapper.java
new file mode 100644
index 00000000..299c0ff8
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/ZyProductProcessMapper.java
@@ -0,0 +1,27 @@
+package org.jeecg.modules.product.zyproductprocess.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import org.jeecg.modules.product.zyproductprocess.entity.ZyProductProcess;
+
+/**
+ * @Description: 产品工序
+ * @Author: jeecg-boot
+ * @Date: 2022-12-14
+ * @Version: V1.0
+ */
+public interface ZyProductProcessMapper extends BaseMapper {
+
+ @Update("update zy_product_process set number=number+1 where id=#{id}")
+ void up(String id);
+ @Update("update zy_product_process set number=number-1 where id=#{id}")
+ void down(String id);
+
+ @Select("select id from zy_process where process_name like #{s}")
+ List find(String s);
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/xml/ZyProductProcessMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/xml/ZyProductProcessMapper.xml
new file mode 100644
index 00000000..7e944338
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/mapper/xml/ZyProductProcessMapper.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/product/zyproductprocess/service/IZyProductProcessService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/service/IZyProductProcessService.java
new file mode 100644
index 00000000..b53b84b3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/service/IZyProductProcessService.java
@@ -0,0 +1,22 @@
+package org.jeecg.modules.product.zyproductprocess.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.product.zyproductprocess.entity.ZyProductProcess;
+
+import java.util.List;
+
+/**
+ * @Description: 产品工序
+ * @Author: jeecg-boot
+ * @Date: 2022-12-14
+ * @Version: V1.0
+ */
+public interface IZyProductProcessService extends IService {
+
+ void up(String id);
+
+ void down(String id);
+
+ List find(String s);
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/service/impl/ZyProductProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/service/impl/ZyProductProcessServiceImpl.java
new file mode 100644
index 00000000..7270a804
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/service/impl/ZyProductProcessServiceImpl.java
@@ -0,0 +1,39 @@
+package org.jeecg.modules.product.zyproductprocess.service.impl;
+
+
+import org.jeecg.modules.product.zyproductprocess.entity.ZyProductProcess;
+import org.jeecg.modules.product.zyproductprocess.mapper.ZyProductProcessMapper;
+import org.jeecg.modules.product.zyproductprocess.service.IZyProductProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Description: 产品工序
+ * @Author: jeecg-boot
+ * @Date: 2022-12-14
+ * @Version: V1.0
+ */
+@Service
+public class ZyProductProcessServiceImpl extends ServiceImpl implements IZyProductProcessService {
+
+ @Autowired
+ ZyProductProcessMapper zyProductProcessMapper;
+ @Override
+ public void up(String id) {
+ zyProductProcessMapper.up(id);
+ }
+
+ @Override
+ public void down(String id) {
+ zyProductProcessMapper.down(id);
+ }
+
+ @Override
+ public List find(String s) {
+ return zyProductProcessMapper.find(s);
+ }
+}