缺陷：FWHL-376

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java

@@ -412,11 +412,29 @@ public class SupplierinvoiceRequestDetailServiceImpl implements SupplierinvoiceR
 
         ConfigInfoVO supplierToBeInvoice = configApi.queryConfigInfoByKey("supplierToBeInvoice");
         if(supplierToBeInvoice!=null&&"0".equals(supplierToBeInvoice.getValue())) {//控制负数必须全选的开关打开
+            ConfigInfoVO supplierToBelnvoiceInfo = configApi.queryConfigInfoByKey("supplierToBelnvoiceInfo");
+            String configSupplerCode = supplierToBelnvoiceInfo.getValue();
+            boolean flag = false;
+            if("999999".equals(configSupplerCode)){
+                flag = true;
+            }else {
+                List<String> supplierCodeList = new ArrayList<>();
+                String[] configSupplierCodeArray = configSupplerCode.split(",");
+                for(int i=0;i<configSupplierCodeArray.length;i++){
+                    String tempSupplierCode = configSupplierCodeArray[i];
+                    supplierCodeList.add(tempSupplierCode);
+                }
+                if(supplierCodeList.contains(detailDO.getSupplierCode())){
+                    flag = true;
+                }
+            }
+            if(flag){
                 //202408271816 HL-5686发票申请创建后点击明细，可开票为负数的不允许删除
                 if (detailDO.getInvoicableQuantity().compareTo(BigDecimal.ZERO) < 0) {
                     throw exception(INVOICED_NEGATIVE_EXIST);
                 }
             }
+        }
         supplierinvoiceInvoicedService.abrogateHandle(List.of(detailDO));//更新代开票实际数量
         Long masterId = detailDO.getMasterId();
         List<SupplierinvoiceRequestDetailDO> historySubDOList = supplierinvoiceRequestDetailMapper.selectByMasterId(new ArrayList<>() {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java

@@ -288,8 +288,26 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq
         // 子表校验
         List<SupplierinvoiceRequestDetailCreateReqVO> subList = createReqVO.getSubList();
 
+        //控制负数必须全选的开关打开
         ConfigInfoVO supplierToBeInvoice = configApi.queryConfigInfoByKey("supplierToBeInvoice");
-        if(supplierToBeInvoice!=null&&"0".equals(supplierToBeInvoice.getValue())){//控制负数必须全选的开关打开
+        if(supplierToBeInvoice!=null&&"0".equals(supplierToBeInvoice.getValue())){
+            ConfigInfoVO supplierToBelnvoiceInfo = configApi.queryConfigInfoByKey("supplierToBelnvoiceInfo");
+            String configSupplerCode = supplierToBelnvoiceInfo.getValue();
+            boolean flag = false;
+            if("999999".equals(configSupplerCode)){
+                flag = true;
+            }else {
+                List<String> supplierCodeList = new ArrayList<>();
+                String[] configSupplierCodeArray = configSupplerCode.split(",");
+                for(int i=0;i<configSupplierCodeArray.length;i++){
+                    String tempSupplierCode = configSupplierCodeArray[i];
+                    supplierCodeList.add(tempSupplierCode);
+                }
+                if(supplierCodeList.contains(createReqVO.getSupplierCode())){
+                    flag = true;
+                }
+            }
+            if(flag){
                 //202408271659 HL-5686点击发票申请保存会校验该供应商+订单类型下是否还有负数发票没有选中，有则提示“明细中包含负数发票，请优先选择负数发票”
                 String supplierCode = createReqVO.getSupplierCode();
                 String orderType = createReqVO.getOrderType();
@@ -315,6 +333,7 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq
                     }
                 }
             }
+        }
         for (SupplierinvoiceRequestDetailCreateReqVO supplierinvoiceRequestDetailCreateReqVO : subList) {
             supplierinvoiceRequestDetailCreateReqVO.setDeliveryDate(String.format("%sT00:00:00", supplierinvoiceRequestDetailCreateReqVO.getDeliveryDate()));
         }