完善代码

srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/SerialPatternServiceImpl.java

@@ -76,6 +76,9 @@ public class SerialPatternServiceImpl extends ServiceImpl<SerialPatternMapper, S
             // 查找最大值
             QueryWrapper<Map<String,String>> queryWrapper = new QueryWrapper<>();
             if(StringUtils.isNotBlank(prefix)){
+                if("sale_invoice".equals(tableName)){
+                    dateStr = "2501";
+                }
                 queryWrapper.likeRight(fieldName,prefix+dateStr);
             }
             Map<String,Object> row = sysSerialPatternMapper.selectMax(tableName, fieldName, queryWrapper);

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleQuotationController.java

@@ -184,11 +184,11 @@ public class SaleQuotationController {
         SaleQuotation saleQuotation = new SaleQuotation();
         BeanUtils.copyProperties(saleQuotationPage, saleQuotation);
 
-        String getSourceCode = saleQuotation.getSourceCode();
-
-        if(StringUtils.isBlank(getSourceCode)){
-            return Result.error("网络异常，请刷新后重试 ！");
-        }
+//        String getSourceCode = saleQuotation.getSourceCode();
+//
+//        if(StringUtils.isBlank(getSourceCode)){
+//            return Result.error("网络异常，请刷新后重试 ！");
+//        }
 
         String code = saleQuotation.getBillCode();
         if (StringUtils.isNotBlank(code)) {
@@ -229,11 +229,11 @@ public class SaleQuotationController {
         SaleQuotation saleQuotation = new SaleQuotation();
         BeanUtils.copyProperties(saleQuotationPage, saleQuotation);
 
-        String getSourceCode = saleQuotation.getSourceCode();
-
-        if(StringUtils.isBlank(getSourceCode)){
-            return Result.error("网络异常，请刷新后重试 ！");
-        }
+//        String getSourceCode = saleQuotation.getSourceCode();
+//
+//        if(StringUtils.isBlank(getSourceCode)){
+//            return Result.error("网络异常，请刷新后重试 ！");
+//        }
         SaleQuotation saleQuotationEntity = saleQuotationService.getById(saleQuotation.getId());
         if (saleQuotationEntity == null) {
             return Result.error("未找到对应数据");
@@ -256,11 +256,11 @@ public class SaleQuotationController {
         SaleQuotation saleQuotation = new SaleQuotation();
         BeanUtils.copyProperties(saleQuotationPage, saleQuotation);
 
-        String getSourceCode = saleQuotation.getSourceCode();
-
-        if(StringUtils.isBlank(getSourceCode)){
-            return Result.error("网络异常，请刷新后重试 ！");
-        }
+//        String getSourceCode = saleQuotation.getSourceCode();
+//
+//        if(StringUtils.isBlank(getSourceCode)){
+//            return Result.error("网络异常，请刷新后重试 ！");
+//        }
 
         SaleQuotation saleQuotationEntity = saleQuotationService.getById(saleQuotation.getId());
         if (saleQuotationEntity == null) {

srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleQuotationHisPage.java

@@ -50,6 +50,8 @@ public class SaleQuotationHisPage {
 	//协议条款
 	private String agreementTerms;
 
+	@ApiModelProperty(value = "整单毛利率(gross margin)")
+	private java.math.BigDecimal grossMarginHead;
 	//联系人主键
 	private String liaisonId;
 	//联系人信息

srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleQuotationPage.java

@@ -197,6 +197,8 @@ public class SaleQuotationPage {
 	private BigDecimal purchaseAmount;
 	@Excel(name = "销售金额合计", width = 15)
 	private BigDecimal saleAmount;
+	@ApiModelProperty(value = "整单毛利率(gross margin)")
+	private java.math.BigDecimal grossMarginHead;
 
 	private String sourceCode;
 	@ExcelCollection(name="销售报价单-船明细")