Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierController.java

@@ -48,7 +48,22 @@ public class BizCarrierController extends BaseController {
         if (tenantId != null && !zero.toString().equals(tenantId)) {
            data.setTenantId(Long.valueOf(tenantId));
         }
-
+//        List<String> A = new ArrayList<>();
+//
+//        for (int i = 1; i <= 99999; i++) {
+//            String a = String.format("%06d", i);
+//            A.add(a);
+//        }
+//        List<BizCarrier>carrierList = new ArrayList<>();
+//        // 输出 List A 中的元素
+//        for (String str : A) {
+//            BizCarrier bizCarrier = new BizCarrier();
+//            bizCarrier.setCode(str);
+//           bizCarrier.setCategoryId(2L);
+//           bizCarrier.setTenantId(1L);
+//            carrierList.add(bizCarrier);
+//        }
+//        iBizCarrierService.saveBatch(carrierList);
         startPage();
         List<BizCarrier> list = iBizCarrierService.getList(data);
         return getDataTable(list);
@@ -72,10 +87,14 @@ public class BizCarrierController extends BaseController {
         if (tenantId != null && !zero.toString().equals(tenantId)) {
             queryWrapper.eq("tenant_id",Long.valueOf(tenantId));
         }
+        queryWrapper.eq("qc_code","");
         List<BizCarrier> list = iBizCarrierService.list(queryWrapper);
         for (BizCarrier item:list
              ) {
-            task.GenerateQcCode(item);
+
+                task.GenerateQcCode(item);
+
+
         }
 
         return success();

src/main/java/cn/ezhizao/project/business/product/controller/BizProductController.java

@@ -1,27 +1,20 @@
 package cn.ezhizao.project.business.product.controller;
 
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.ezhizao.project.business.product.domain.BizProduct;
 import cn.ezhizao.project.business.product.service.IBizProductService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 产品管理Controller

src/main/java/cn/ezhizao/project/business/technologicalProcessDetail/controller/BizTechnologicalProcessDetailController.java

@@ -41,7 +41,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
     {
 //        String tenantId = request.getHeader("tenantId");
 //        bizTechnologicalProcessDetail.setTenantId(Long.valueOf(tenantId));
-        startPage();
+//        startPage();
         List<BizTechnologicalProcessDetail> list = bizTechnologicalProcessDetailService.getList(bizTechnologicalProcessDetail);
 
         return getDataTable(list);

src/main/resources/mybatis/business/technologicalProcessDetail/BizTechnologicalProcessDetailMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by process_step_number
     </select>
 
+
     <delete id="physicalDelete">
         DELETE FROM biz_technological_process_detail
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">