Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/controller/BizInboundOrderController.java

@@ -302,7 +302,7 @@ public class BizInboundOrderController extends BaseController {
             if (checkDetails.stream().noneMatch(x -> x.getCertificateCode().equals(l))) {
                 detail.setCertificateId(item != null ? item.getCertificateId() : null);
                 detail.setCertificateLotId(item != null ? item.getId() : null);
-                detail.setInboundNum(certificate != null ? Long.valueOf(certificate.getPackageNumber()) : null);
+                detail.setInboundNum(certificate != null ? Long.valueOf(certificate.getLabelNumber()) : null);
                 // 第一个操作人
                 detail.setFirstOperatorUserId(!packageResourceGroupDetails.isEmpty() ? packageResourceGroupDetails.get(0).getUserId() : null);
                 detail.setFirstOperatorUserName(!packageResourceGroupDetails.isEmpty() ? packageResourceGroupDetails.get(0).getUserName() : null);

src/main/java/cn/ezhizao/project/business/controller/BizReturnReceiptController.java

@@ -12,6 +12,7 @@ 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.interceptor.annotation.RepeatSubmit;
 import cn.ezhizao.framework.redis.RedisCache;
 import cn.ezhizao.framework.security.LoginUser;
 import cn.ezhizao.framework.web.controller.BaseController;
@@ -474,6 +475,7 @@ public class BizReturnReceiptController extends BaseController
     @Transactional
 //    @PostMapping("/new")
     @PostMapping
+    @RepeatSubmit(interval = 60000)
     public AjaxResult addNew(@RequestBody BizReturnReceipt bizReturnReceipt) throws NoSuchFieldException, IllegalAccessException, ParseException {
         String tenantId = request.getHeader("tenantId");
         bizReturnReceipt.setTenantId(Long.valueOf(tenantId));
@@ -870,6 +872,7 @@ public class BizReturnReceiptController extends BaseController
     @Log(title = "修改外协单", businessType = BusinessType.UPDATE)
     @Transactional
     @PutMapping
+    @RepeatSubmit(interval = 60000)
     public AjaxResult editNew(@RequestBody BizReturnReceipt bizReturnReceipt) throws NoSuchFieldException, IllegalAccessException, ParseException {
         String tenantId = request.getHeader("tenantId");
         bizReturnReceipt.setTenantId(Long.valueOf(tenantId));

src/main/java/cn/ezhizao/project/business/domain/BizCompanyProductPackage.java

@@ -194,4 +194,5 @@ public class BizCompanyProductPackage extends BaseEntity
     @Excel(name = "技术员名")
     @ApiModelProperty(value = "技术员名")
     private String jsyna;
+    private Integer isBanned;
 }

src/main/resources/mybatis/business/BizCompanyProductPackageMapper.xml

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getList" parameterType="BizCompanyProductPackage" resultMap="BizCompanyProductPackageResult">
         SELECT * FROM biz_company_product_package
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            deleted = 0
+            deleted = 0 and is_banned = 0
             <if test="productId != null "> AND product_id = #{productId}</if>
             <if test="companyId != null "> AND company_id = #{companyId}</if>
             <if test="productCode != null  and productCode != ''"> AND product_code = #{productCode}</if>