完善代码

srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurPurchaseQuotationController.java

@@ -132,7 +132,7 @@ public class PurPurchaseQuotationController {
             }
         }
 
-        queryWrapper.orderByDesc("product_code");
+        queryWrapper.orderByAsc("product_code");
         IPage<SupplierQuotationDetails> pageList = purPurchaseInquiryProductService.supplierQuotationDetails(page, queryWrapper);
 
         Map<String,BigDecimal> map = new HashMap<>();
@@ -510,36 +510,25 @@ public class PurPurchaseQuotationController {
             //提交(1-是 ，0-否)
             String submit = o.getSubmit();
             String code = o.getBillCode();
+            String sourceCode = o.getSourceCode();
 
             if (submit == null || submit == "" || submit.equals("0")) {
                 sb.append("单号" + code).append("已取消提交，请勿再次取消提交；");
                 continue;
             }
-            saleQuotationService.list();
 
-            QueryWrapper<PurInquiryForm> queryPurInquiryForm = new QueryWrapper();
-            queryPurInquiryForm.eq("source_code", code);
-            queryPurInquiryForm.eq("del_flag", "0");
+            QueryWrapper<PurQuotationSelection> purQuotationSelection = new QueryWrapper();
+            purQuotationSelection.like("source_id", sourceCode);
+            purQuotationSelection.eq("del_flag", "0");
 
-            List<PurInquiryForm> listPurInquiryForm = purInquiryFormService.list(queryPurInquiryForm);
-            if (listPurInquiryForm.size() > 0) {
-                List<String> codeList = listPurInquiryForm.stream().map(PurInquiryForm::getBillCode).collect(Collectors.toList());
+            List<PurQuotationSelection> listPurQuotationSelection = purQuotationSelectionService.list(purQuotationSelection);
+            if (listPurQuotationSelection.size() > 0) {
+                List<String> codeList = listPurQuotationSelection.stream().map(PurQuotationSelection::getBillCode).collect(Collectors.toList());
                 String codes = StringUtils.join(codeList.toArray(), ",");
-                sb.append("单号" + code).append("已被客户询价单使用，请勿取消提交" + codes + "；");
+                sb.append("单号" + code).append("已被报价选定使用，请勿取消提交" + codes + "；");
                 continue;
             }
 
-//            QueryWrapper<PurOrder> queryPurOrder = new QueryWrapper();
-//            queryPurOrder.eq("source_code", code);
-//            queryPurOrder.eq("del_flag", "0");
-//
-//            List<PurOrder> listPurOrder = purOrderService.list(queryPurOrder);
-//            if (listPurOrder.size() > 0) {
-//                List<String> codeList = listPurOrder.stream().map(PurOrder::getBillCode).collect(Collectors.toList());
-//                String codes = StringUtils.join(codeList.toArray(), ",");
-//                sb.append("单号" + code).append("已被采购订单使用，请勿取消提交" + codes + "；");
-//                continue;
-//            }
         }
 
         if (StringUtils.isNotBlank(sb.toString())) {

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotation.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.purCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -169,4 +170,6 @@ public class PurPurchaseQuotation implements Serializable {
     @Excel(name = "交期天数", width = 15)
     @ApiModelProperty(value = "交期天数")
     private String deliveryDayHead;
+    //订单总金额
+    private BigDecimal totalAmount;
 }

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotationProduct.java

@@ -149,9 +149,10 @@ public class PurPurchaseQuotationProduct implements Serializable {
     @ApiModelProperty(value = "备注")
     private String notes;
 	/**来源id(采购询价单-产品id)*/
-	@Excel(name = "来源id(采购询价单-产品id)", width = 15)
     @ApiModelProperty(value = "来源id(采购询价单-产品id)")
     private String sourceId;
+    @ApiModelProperty(value = "来源id(销售询价单-产品id)")
+    private String sourceId2;
 
     //交期天数
     @Excel(name = "交期天数", width = 15)

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelection.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.purCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -113,4 +114,9 @@ public class PurQuotationSelection implements Serializable {
 	@Excel(name = "来源单号（询价单）", width = 15)
     @ApiModelProperty(value = "来源单号（询价单）")
     private String sourceId;
+
+	//订单总金额
+	private BigDecimal totalAmount;
+	//订单总金额(美元)
+	private BigDecimal totalAmountUsd;
 }

srm-module-code/src/main/java/org/jeecg/modules/purCode/mapper/xml/PurPurchaseQuotationProductMapper.xml

@@ -45,6 +45,7 @@
 					  , b.tax_amount
 					  , b.last_price
 					  , b.tax_price
+					  , b.source_id2
 				 from pur_purchase_quotation a
 						  left join pur_purchase_quotation_product b on a.id = b.head_id
 

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/impl/PurPaymentRequestServiceImpl.java

@@ -52,6 +52,7 @@ public class PurPaymentRequestServiceImpl extends ServiceImpl<PurPaymentRequestM
 		if(purPaymentRequestDetailsList!=null && purPaymentRequestDetailsList.size()>0) {
 			for(PurPaymentRequestDetails entity:purPaymentRequestDetailsList) {
 				//外键设置
+				entity.setId(null);
 				entity.setHeadId(purPaymentRequest.getId());
 				purPaymentRequestDetailsMapper.insert(entity);
 			}
@@ -141,6 +142,7 @@ public class PurPaymentRequestServiceImpl extends ServiceImpl<PurPaymentRequestM
 		if(purPaymentRequestDetailsList!=null && purPaymentRequestDetailsList.size()>0) {
 			for(PurPaymentRequestDetails entity:purPaymentRequestDetailsList) {
 				//外键设置
+				entity.setId(null);
 				entity.setHeadId(purPaymentRequest.getId());
 				purPaymentRequestDetailsMapper.insert(entity);
 			}

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/impl/PurPurchaseQuotationServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Collection;
 
@@ -34,6 +35,17 @@ public class PurPurchaseQuotationServiceImpl extends ServiceImpl<PurPurchaseQuot
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveMain(PurPurchaseQuotation purPurchaseQuotation, List<PurPurchaseQuotationShip> purPurchaseQuotationShipList,List<PurPurchaseQuotationProduct> purPurchaseQuotationProductList) {
+
+		BigDecimal totalAmount = BigDecimal.ZERO;
+		if(purPurchaseQuotationProductList !=null && purPurchaseQuotationProductList.size()>0) {
+			for(PurPurchaseQuotationProduct entity: purPurchaseQuotationProductList) {
+				BigDecimal taxAmount = entity.getTaxAmount() == null ? BigDecimal.ZERO:entity.getTaxAmount();
+				totalAmount = totalAmount.add(taxAmount);
+			}
+		}
+
+		purPurchaseQuotation.setTotalAmount(totalAmount);
+
 		purPurchaseQuotationMapper.insert(purPurchaseQuotation);
 		if(purPurchaseQuotationShipList!=null && purPurchaseQuotationShipList.size()>0) {
 			for(PurPurchaseQuotationShip entity:purPurchaseQuotationShipList) {
@@ -56,6 +68,17 @@ public class PurPurchaseQuotationServiceImpl extends ServiceImpl<PurPurchaseQuot
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateMain(PurPurchaseQuotation purPurchaseQuotation,List<PurPurchaseQuotationShip> purPurchaseQuotationShipList,List<PurPurchaseQuotationProduct> purPurchaseQuotationProductList) {
+
+		BigDecimal totalAmount = BigDecimal.ZERO;
+		if(purPurchaseQuotationProductList !=null && purPurchaseQuotationProductList.size()>0) {
+			for(PurPurchaseQuotationProduct entity: purPurchaseQuotationProductList) {
+				BigDecimal taxAmount = entity.getTaxAmount() == null ? BigDecimal.ZERO:entity.getTaxAmount();
+				totalAmount = totalAmount.add(taxAmount);
+			}
+		}
+
+		purPurchaseQuotation.setTotalAmount(totalAmount);
+
 		purPurchaseQuotationMapper.updateById(purPurchaseQuotation);
 		
 		//1.先删除子表数据

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/impl/PurQuotationSelectionServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -71,7 +72,17 @@ public class PurQuotationSelectionServiceImpl extends ServiceImpl<PurQuotationSe
             sourceId = deduplicated;
         }
 
+        BigDecimal totalAmount = BigDecimal.ZERO;
+        BigDecimal totalAmountUsd = BigDecimal.ZERO;
+
         if (purQuotationSelectionProductList != null && purQuotationSelectionProductList.size() > 0) {
+            for (PurQuotationSelectionProduct entity : purQuotationSelectionProductList) {
+
+                BigDecimal taxAmount = entity.getTaxAmount() == null ? BigDecimal.ZERO:entity.getTaxAmount();
+                BigDecimal taxAmountUsd = entity.getTaxAmountUsd() == null ? BigDecimal.ZERO:entity.getTaxAmountUsd();
+                totalAmount = totalAmount.add(taxAmount);
+                totalAmountUsd = totalAmountUsd.add(taxAmountUsd);
+            }
 
             String queryId = purQuotationSelectionProductList.get(0).getSourceId2();//报价单主表主键
             if(StringUtils.isNotBlank(queryId)){
@@ -82,6 +93,8 @@ public class PurQuotationSelectionServiceImpl extends ServiceImpl<PurQuotationSe
                 }
             }
         }
+        purQuotationSelection.setTotalAmount(totalAmount);
+        purQuotationSelection.setTotalAmountUsd(totalAmountUsd);
 
         purQuotationSelectionMapper.insert(purQuotationSelection);
         if (purQuotationSelectionShipList != null && purQuotationSelectionShipList.size() > 0) {
@@ -161,8 +174,19 @@ public class PurQuotationSelectionServiceImpl extends ServiceImpl<PurQuotationSe
 //            }
 //        }
 
+        BigDecimal totalAmount = BigDecimal.ZERO;
+        BigDecimal totalAmountUsd = BigDecimal.ZERO;
+
         if (purQuotationSelectionProductList != null && purQuotationSelectionProductList.size() > 0) {
 
+            for (PurQuotationSelectionProduct entity : purQuotationSelectionProductList) {
+
+                BigDecimal taxAmount = entity.getTaxAmount() == null ? BigDecimal.ZERO:entity.getTaxAmount();
+                BigDecimal taxAmountUsd = entity.getTaxAmountUsd() == null ? BigDecimal.ZERO:entity.getTaxAmountUsd();
+                totalAmount = totalAmount.add(taxAmount);
+                totalAmountUsd = totalAmountUsd.add(taxAmountUsd);
+            }
+
             String queryId = purQuotationSelectionProductList.get(0).getSourceId2();//报价单主表主键
             if(StringUtils.isNotBlank(queryId)){
 
@@ -172,6 +196,8 @@ public class PurQuotationSelectionServiceImpl extends ServiceImpl<PurQuotationSe
                 }
             }
         }
+        purQuotationSelection.setTotalAmount(totalAmount);
+        purQuotationSelection.setTotalAmountUsd(totalAmountUsd);
 
         purQuotationSelectionMapper.updateById(purQuotationSelection);
 

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurPurchaseQuotationPage.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.purCode.vo;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -159,6 +160,8 @@ public class PurPurchaseQuotationPage {
 	@ApiModelProperty(value = "来源单号（采购报价单）")
 	private String sourceCode;
 
+	//订单总金额
+	private BigDecimal totalAmount;
 	@ExcelCollection(name="采购报价单 - 船明细")
 	@ApiModelProperty(value = "采购报价单 - 船明细")
 	private List<PurPurchaseQuotationShip> purPurchaseQuotationShipList;

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionPage.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.purCode.vo;
 
+import java.math.BigDecimal;
 import java.util.List;
 import org.jeecg.modules.purCode.entity.PurQuotationSelection;
 import org.jeecg.modules.purCode.entity.PurQuotationSelectionShip;
@@ -106,6 +107,10 @@ public class PurQuotationSelectionPage {
 	@Excel(name = "来源主键（询价单）", width = 15)
 	@ApiModelProperty(value = "来源主键（询价单）")
     private String sourceId;
+	//订单总金额
+	private BigDecimal totalAmount;
+	//订单总金额(美元)
+	private BigDecimal totalAmountUsd;
 
 	@ExcelCollection(name="采购报价选定子表 - 船明细")
 	@ApiModelProperty(value = "采购报价选定子表 - 船明细")

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/SupplierQuotationDetails.java

@@ -238,6 +238,9 @@ public class SupplierQuotationDetails {
     @ApiModelProperty(value = "来源id(采购询价单-产品id)")
     private String sourceId;
 
+    //销售询价单-产品id
+    private String sourceId2;
+
 
     //交期天数
     @Excel(name = "交期天数", width = 15)

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

@@ -208,21 +208,26 @@ public class SaleContractController {
         int newV = Integer.valueOf(version) + 1;
 
         List<SaleContractShipHis> saleContractShipList = new ArrayList<>();
-        for (SaleContractShip o : saleContractPage.getSaleContractShipList()) {
-            SaleContractShipHis his = new SaleContractShipHis();
-            BeanUtils.copyProperties(o, his);
-            his.setId(null);
-            his.setHisId(o.getId());
-            saleContractShipList.add(his);
+        if(saleContractPage.getSaleContractShipList() !=null && saleContractPage.getSaleContractShipList().size() > 0){
+            for (SaleContractShip o : saleContractPage.getSaleContractShipList()) {
+                SaleContractShipHis his = new SaleContractShipHis();
+                BeanUtils.copyProperties(o, his);
+                his.setId(null);
+                his.setHisId(o.getId());
+                saleContractShipList.add(his);
+            }
+
         }
 
         List<SaleContractProductHis> saleContractProductList = new ArrayList<>();
-        for (SaleContractProduct o : saleContractPage.getSaleContractProductList()) {
-            SaleContractProductHis his = new SaleContractProductHis();
-            BeanUtils.copyProperties(o, his);
-            his.setId(null);
-            his.setHisId(o.getId());
-            saleContractProductList.add(his);
+        if(saleContractPage.getSaleContractProductList() !=null && saleContractPage.getSaleContractProductList().size() > 0){
+            for (SaleContractProduct o : saleContractPage.getSaleContractProductList()) {
+                SaleContractProductHis his = new SaleContractProductHis();
+                BeanUtils.copyProperties(o, his);
+                his.setId(null);
+                his.setHisId(o.getId());
+                saleContractProductList.add(his);
+            }
         }
 
         SaleContractHis saleContractHis = new SaleContractHis();

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

@@ -141,7 +141,15 @@ public class SaleDeliveryController {
         return Result.OK(pageList);
     }
 
-    @ApiOperation(value = "发货通知单弹框明细", notes = "发货通知单弹框明细")
+    /**
+     *
+     * @param saleInquiryForm
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "发货通知单弹框明细-销售出库单使用", notes = "发货通知单弹框明细-销售出库单使用")
     @GetMapping(value = "/selectSaleDeliveryAlert")
     @PermissionData(pageComponent="saleCode/deliveryNotice/deliveryNoticeList")
     public Result<IPage<SaleDeliveryAlert>> selectSaleDeliveryAlert(SaleDeliveryAlert saleInquiryForm,
@@ -151,6 +159,7 @@ public class SaleDeliveryController {
 
         QueryWrapper<SaleDeliveryAlert> queryWrapper = QueryGenerator.initQueryWrapper(saleInquiryForm, req.getParameterMap());
         Page<SaleDeliveryAlert> page = new Page<SaleDeliveryAlert>(pageNo, pageSize);
+        queryWrapper.apply("quantity > IFNULL(delivery_quantity, 0)");
         IPage<SaleDeliveryAlert> pageList = saleDeliveryDetailsService.selectSaleDeliveryAlert(page, queryWrapper);
         return Result.OK(pageList);
     }
@@ -163,7 +172,7 @@ public class SaleDeliveryController {
      * @param req
      * @return
      */
-    @ApiOperation(value = "发货通知单弹框明细", notes = "发货通知单弹框明细")
+    @ApiOperation(value = "发货通知单弹框明细-销售发票使用", notes = "发货通知单弹框明细-销售发票使用")
     @GetMapping(value = "/selectSaleDeliveryAlertInvoice")
     @PermissionData(pageComponent="saleCode/deliveryNotice/deliveryNoticeList")
     public Result<IPage<SaleDeliveryAlert>> selectSaleDeliveryAlertInvoice(SaleDeliveryAlert saleInquiryForm,

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

@@ -135,7 +135,7 @@ public class SaleOrderController {
     //@AutoLog(value = "销售订单-分页列表查询")
     @ApiOperation(value = "销售订单-分页列表查询", notes = "销售订单-分页列表查询")
     @GetMapping(value = "/list")
-    @PermissionData(pageComponent="saleCode/salesOrder/SaleOrderFormList")
+    @PermissionData(pageComponent = "saleCode/salesOrder/SaleOrderFormList")
     public Result<IPage<SaleOrder>> queryPageList(SaleOrder saleOrder,
                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -146,9 +146,30 @@ public class SaleOrderController {
         return Result.OK(pageList);
     }
 
+    /**
+     * 销售订单弹框明细-佣金付款使用
+     * @param saleOrder
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "销售订单弹框明细-佣金付款使用", notes = "销售订单弹框明细-佣金付款使用")
+    @GetMapping(value = "/selectSaleOrderDetailCommissionPay")
+    @PermissionData(pageComponent = "saleCode/salesOrder/SaleOrderFormList")
+    public Result<IPage<SaleOrder>> selectSaleOrderDetailCommissionPay(SaleOrder saleOrder,
+                                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                       HttpServletRequest req) {
+        QueryWrapper<SaleOrder> queryWrapper = QueryGenerator.initQueryWrapper(saleOrder, req.getParameterMap());
+        Page<SaleOrder> page = new Page<SaleOrder>(pageNo, pageSize);
+        IPage<SaleOrder> pageList = saleOrderService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
 
     /**
-     * 销售订单弹框明细
+     * 销售订单弹框明细 通用
      *
      * @param saleInquiryForm
      * @param pageNo
@@ -158,11 +179,11 @@ public class SaleOrderController {
      */
     @ApiOperation(value = "销售订单弹框明细", notes = "销售订单弹框明细")
     @GetMapping(value = "/selectSaleOrderDetailAlert")
-    @PermissionData(pageComponent="saleCode/salesOrder/SaleOrderFormList")
+    @PermissionData(pageComponent = "saleCode/salesOrder/SaleOrderFormList")
     public Result<IPage<SaleOrderAlert>> selectContractDetailAlert(SaleOrderAlert saleInquiryForm,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
+                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                   HttpServletRequest req) {
 
         QueryWrapper<SaleOrderAlert> queryWrapper = QueryGenerator.initQueryWrapper(saleInquiryForm, req.getParameterMap());
         Page<SaleOrderAlert> page = new Page<SaleOrderAlert>(pageNo, pageSize);
@@ -171,7 +192,7 @@ public class SaleOrderController {
     }
 
     /**
-     * 销售订单弹框明细
+     * 销售订单弹框明细-采购订单使用
      *
      * @param saleInquiryForm
      * @param pageNo
@@ -179,17 +200,42 @@ public class SaleOrderController {
      * @param req
      * @return
      */
-    @ApiOperation(value = "销售订单弹框明细", notes = "销售订单弹框明细")
+    @ApiOperation(value = "销售订单弹框明细-采购订单使用", notes = "销售订单弹框明细-采购订单使用")
     @GetMapping(value = "/selectSaleOrderDetailAlertExistSup")
-    @PermissionData(pageComponent="saleCode/salesOrder/SaleOrderFormList")
+    @PermissionData(pageComponent = "saleCode/salesOrder/SaleOrderFormList")
     public Result<IPage<SaleOrderAlert>> selectSaleOrderDetailAlertExistSup(SaleOrderAlert saleInquiryForm,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
+                                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                            HttpServletRequest req) {
 
         QueryWrapper<SaleOrderAlert> queryWrapper = QueryGenerator.initQueryWrapper(saleInquiryForm, req.getParameterMap());
         Page<SaleOrderAlert> page = new Page<SaleOrderAlert>(pageNo, pageSize);
         queryWrapper.isNotNull("supplier_id");
+        queryWrapper.apply("quantity > IFNULL(purchase_quantity, 0)");
+        IPage<SaleOrderAlert> pageList = saleOrderProductService.selectSaleOrderDetailAlert(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 销售订单弹框明细-发货通知单使用
+     *
+     * @param saleInquiryForm
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "销售订单弹框明细-发货通知单使用", notes = "销售订单弹框明细-发货通知单使用")
+    @GetMapping(value = "/selectSaleOrderDetailAlertDelivery")
+    @PermissionData(pageComponent = "saleCode/salesOrder/SaleOrderFormList")
+    public Result<IPage<SaleOrderAlert>> selectSaleOrderDetailAlertDelivery(SaleOrderAlert saleInquiryForm,
+                                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                            HttpServletRequest req) {
+
+        QueryWrapper<SaleOrderAlert> queryWrapper = QueryGenerator.initQueryWrapper(saleInquiryForm, req.getParameterMap());
+        Page<SaleOrderAlert> page = new Page<SaleOrderAlert>(pageNo, pageSize);
+        queryWrapper.apply("quantity > IFNULL(delivery_quantity, 0)");
         IPage<SaleOrderAlert> pageList = saleOrderProductService.selectSaleOrderDetailAlert(page, queryWrapper);
         return Result.OK(pageList);
     }
@@ -213,7 +259,7 @@ public class SaleOrderController {
         String getSourceCode = saleOrder.getSourceCode();
         String getSourceCode2 = saleOrder.getSourceCode2();
 
-        if(StringUtils.isBlank(getSourceCode) && StringUtils.isBlank(getSourceCode2)){
+        if (StringUtils.isBlank(getSourceCode) && StringUtils.isBlank(getSourceCode2)) {
             return Result.error("网络异常，请刷新后重试 ！");
         }
 
@@ -236,7 +282,7 @@ public class SaleOrderController {
             saleOrder.setBillCode(result.getMessage());
         }
 
-		saleOrder.setVersion("1");
+        saleOrder.setVersion("1");
         saleOrderService.saveMain(saleOrder, saleOrderPage.getSaleOrderShipList(), saleOrderPage.getSaleOrderProductList());
         return Result.OK("添加成功！");
     }
@@ -258,7 +304,7 @@ public class SaleOrderController {
         String getSourceCode = saleOrder.getSourceCode();
         String getSourceCode2 = saleOrder.getSourceCode2();
 
-        if(StringUtils.isBlank(getSourceCode) && StringUtils.isBlank(getSourceCode2)){
+        if (StringUtils.isBlank(getSourceCode) && StringUtils.isBlank(getSourceCode2)) {
             return Result.error("网络异常，请刷新后重试 ！");
         }
 
@@ -300,7 +346,7 @@ public class SaleOrderController {
         int newV = Integer.valueOf(version) + 1;
 
         List<SaleOrderShipHis> saleOrderShipHisList = new ArrayList<>();
-        if (saleOrderPage.getSaleOrderShipList().size() > 0) {
+        if (saleOrderPage.getSaleOrderShipList() !=null && saleOrderPage.getSaleOrderShipList().size() > 0) {
             for (SaleOrderShip o : saleOrderPage.getSaleOrderShipList()) {
                 SaleOrderShipHis his = new SaleOrderShipHis();
                 BeanUtils.copyProperties(o, his);
@@ -312,7 +358,7 @@ public class SaleOrderController {
         }
 
         List<SaleOrderProductHis> saleOrderProductList = new ArrayList<>();
-        if (saleOrderPage.getSaleOrderProductList().size() > 0) {
+        if (saleOrderPage.getSaleOrderProductList() !=null && saleOrderPage.getSaleOrderProductList().size() > 0) {
 
             for (SaleOrderProduct o : saleOrderPage.getSaleOrderProductList()) {
                 SaleOrderProductHis his = new SaleOrderProductHis();
@@ -495,10 +541,10 @@ public class SaleOrderController {
             querySaleDelivery.eq("del_flag", "0");
 
             List<SaleDelivery> listSaleDelivery = saleDeliveryService.list(querySaleDelivery);
-            if(listSaleDelivery.size() > 0){
+            if (listSaleDelivery.size() > 0) {
                 List<String> codeList = listSaleDelivery.stream().map(SaleDelivery::getBillCode).collect(Collectors.toList());
                 String codes = StringUtils.join(codeList.toArray(), ",");
-                sb.append("单号" + code).append("已被发货通知单使用，请勿取消提交"+codes+"；");
+                sb.append("单号" + code).append("已被发货通知单使用，请勿取消提交" + codes + "；");
                 continue;
             }
 
@@ -507,10 +553,10 @@ public class SaleOrderController {
             querySaleAdvancePayment.eq("del_flag", "0");
 
             List<SaleAdvancePayment> listSaleAdvancePayment = saleAdvancePaymentService.list(querySaleAdvancePayment);
-            if(listSaleAdvancePayment.size() > 0){
+            if (listSaleAdvancePayment.size() > 0) {
                 List<String> codeList = listSaleAdvancePayment.stream().map(SaleAdvancePayment::getBillCode).collect(Collectors.toList());
                 String codes = StringUtils.join(codeList.toArray(), ",");
-                sb.append("单号" + code).append("已被预收款使用，请勿取消提交"+codes+"；");
+                sb.append("单号" + code).append("已被预收款使用，请勿取消提交" + codes + "；");
                 continue;
             }
 
@@ -519,10 +565,10 @@ public class SaleOrderController {
             querySaleReceipt.eq("del_flag", "0");
 
             List<SaleReceipt> listSaleReceipt = saleReceiptService.list(querySaleReceipt);
-            if(listSaleReceipt.size() > 0){
+            if (listSaleReceipt.size() > 0) {
                 List<String> codeList = listSaleReceipt.stream().map(SaleReceipt::getBillCode).collect(Collectors.toList());
                 String codes = StringUtils.join(codeList.toArray(), ",");
-                sb.append("单号" + code).append("已被收款单使用，请勿取消提交"+codes+"；");
+                sb.append("单号" + code).append("已被收款单使用，请勿取消提交" + codes + "；");
                 continue;
             }
 
@@ -531,10 +577,10 @@ public class SaleOrderController {
             queryPurOrder.eq("del_flag", "0");
 
             List<PurOrder> listPurOrder = purOrderService.list(queryPurOrder);
-            if(listPurOrder.size() > 0){
+            if (listPurOrder.size() > 0) {
                 List<String> codeList = listPurOrder.stream().map(PurOrder::getBillCode).collect(Collectors.toList());
                 String codes = StringUtils.join(codeList.toArray(), ",");
-                sb.append("单号" + code).append("已被采购订单使用，请勿取消提交"+codes+"；");
+                sb.append("单号" + code).append("已被采购订单使用，请勿取消提交" + codes + "；");
                 continue;
             }
 
@@ -543,10 +589,10 @@ public class SaleOrderController {
             queryPurCommissionRequest.eq("del_flag", "0");
 
             List<PurCommissionRequest> listPurCommissionRequest = purCommissionRequestService.list(queryPurCommissionRequest);
-            if(listPurCommissionRequest.size() > 0){
+            if (listPurCommissionRequest.size() > 0) {
                 List<String> codeList = listPurCommissionRequest.stream().map(PurCommissionRequest::getBillCode).collect(Collectors.toList());
                 String codes = StringUtils.join(codeList.toArray(), ",");
-                sb.append("单号" + code).append("已被佣金付款申请使用，请勿取消提交"+codes+"；");
+                sb.append("单号" + code).append("已被佣金付款申请使用，请勿取消提交" + codes + "；");
                 continue;
             }
 
@@ -616,7 +662,7 @@ public class SaleOrderController {
 
         SaleOrder ent = new SaleOrder();
         ent.setStatus(1);
-        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ent.setConfirmBy(sysUser.getUsername());
         ent.setConfirmTime(new Date());
         saleOrderService.update(ent, queryWrapper);
@@ -904,7 +950,6 @@ public class SaleOrderController {
 
     /**
      * 导出excel
-     *
      */
     @RequestMapping(value = "/exportBillXls")
     public void exportBillXls(HttpServletResponse response, SaleOrder saleOrder1) throws Exception {
@@ -915,9 +960,9 @@ public class SaleOrderController {
         List<SaleOrderProduct> productList = saleOrderProductService.selectByMainId(saleOrder.getId());
         List<SaleOrderShip> saleOrderShipList = saleOrderShipService.selectByMainId(saleOrder.getId());
         BaseTemplates templates = null;
-        if (saleOrder.getDoubleDiscount() == null){
+        if (saleOrder.getDoubleDiscount() == null) {
             templates = templatesN;
-        }else{
+        } else {
             templates = templatesZ;
         }
         if (templates != null) {
@@ -943,7 +988,7 @@ public class SaleOrderController {
                 }
                 // 获取计产品档案
                 List<BaseProductArchive> productArchiveList = new ArrayList<>();
-                if (oConvertUtils.listIsNotEmpty(productList)){
+                if (oConvertUtils.listIsNotEmpty(productList)) {
                     LambdaQueryWrapper<BaseProductArchive> productWrapper = new LambdaQueryWrapper<>();
                     productWrapper.in(BaseProductArchive::getId, productList.stream().map(SaleOrderProduct::getProductId).collect(Collectors.toList()));
                     productArchiveList = baseProductArchiveService.list(productWrapper);
@@ -958,22 +1003,22 @@ public class SaleOrderController {
                 // 产品设置
                 int rowNum = 1;
                 BigDecimal orderMoney = BigDecimal.ZERO;
-                for(SaleOrderProduct o:productList){
-                    BigDecimal amount = o.getTaxAmount() == null ? BigDecimal.ZERO: o.getTaxAmount();
+                for (SaleOrderProduct o : productList) {
+                    BigDecimal amount = o.getTaxAmount() == null ? BigDecimal.ZERO : o.getTaxAmount();
                     orderMoney = orderMoney.add(amount);
                     o.setRowNumber(rowNum++);
-                    if (o.getDeliveryTime() != null){
+                    if (o.getDeliveryTime() != null) {
                         o.setDeliverDateText(DateUtils.date2Str(o.getDeliveryTime(), DateUtils.date_sdf.get()));
                     }
-                    if (oConvertUtils.isNotEmpty(o.getDiscount()) && o.getDiscount().intValue() != 0){
-                        o.setDiscountText(o.getDiscount().intValue()+"%");
+                    if (oConvertUtils.isNotEmpty(o.getDiscount()) && o.getDiscount().intValue() != 0) {
+                        o.setDiscountText(o.getDiscount().intValue() + "%");
                     }
-                    BaseProductArchive findProduct = productArchiveList.stream().filter(e->e.getId().equals(o.getProductId())).findFirst().orElse(null);
-                    if (findProduct != null){
+                    BaseProductArchive findProduct = productArchiveList.stream().filter(e -> e.getId().equals(o.getProductId())).findFirst().orElse(null);
+                    if (findProduct != null) {
                         o.setUnit(findProduct.getMeasurementUnit());
-                        if (findProduct.getMeasurementUnit() != null){
-                            DictModel findDict = unitDictList.stream().filter(d->d.getValue().equals(findProduct.getMeasurementUnit())).findFirst().orElse(null);
-                            if (findDict != null){
+                        if (findProduct.getMeasurementUnit() != null) {
+                            DictModel findDict = unitDictList.stream().filter(d -> d.getValue().equals(findProduct.getMeasurementUnit())).findFirst().orElse(null);
+                            if (findDict != null) {
                                 o.setUnit(findDict.getText());
                             }
                         }
@@ -985,37 +1030,37 @@ public class SaleOrderController {
                 String shipname = "";
                 String imo = "";
 
-                if(oConvertUtils.listIsNotEmpty(saleOrderShipList)){
+                if (oConvertUtils.listIsNotEmpty(saleOrderShipList)) {
 
                     shipname = saleOrderShipList.stream().map(SaleOrderShip::getShipName).distinct().collect(Collectors.joining());
 
                     LambdaQueryWrapper<BaseShipArchive> shipArchiveLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                    shipArchiveLambdaQueryWrapper.in(BaseShipArchive::getId,saleOrderShipList.stream().map(SaleOrderShip::getShipId).collect(Collectors.joining()));
+                    shipArchiveLambdaQueryWrapper.in(BaseShipArchive::getId, saleOrderShipList.stream().map(SaleOrderShip::getShipId).collect(Collectors.joining()));
                     List<BaseShipArchive> baseShipArchiveList = baseShipArchiveService.list(shipArchiveLambdaQueryWrapper);
 
-                    if(oConvertUtils.listIsNotEmpty(baseShipArchiveList)){
+                    if (oConvertUtils.listIsNotEmpty(baseShipArchiveList)) {
                         imo = baseShipArchiveList.stream().map(BaseShipArchive::getImo).distinct().collect(Collectors.joining());
                     }
                 }
                 saleOrder.setShipName(shipname);
                 saleOrder.setImo(imo);
                 // 项目名称
-                if (saleOrder.getProject() != null){
+                if (saleOrder.getProject() != null) {
                     BaseProjectArchive projectArchive = baseProjectArchiveService.getById(saleOrder.getProject());
-                    if (projectArchive != null){
+                    if (projectArchive != null) {
                         saleOrder.setContactsNo(projectArchive.getName());
                     }
 
                 }
 
-                if(productList.size() > 0){
+                if (productList.size() > 0) {
 
                     saleOrder.setQualityGrade(productList.get(0).getQualityGrade());
                 }
                 //
                 saleOrder.setBillDateText(DateUtils.date2Str(saleOrder.getBillDate(), DateUtils.date_sdf.get()));
-                if (oConvertUtils.isNotEmpty(saleOrder.getDoubleDiscount())){
-                    saleOrder.setDiscountText(saleOrder.getDoubleDiscount().intValue()+"%");
+                if (oConvertUtils.isNotEmpty(saleOrder.getDoubleDiscount())) {
+                    saleOrder.setDiscountText(saleOrder.getDoubleDiscount().intValue() + "%");
                     saleOrder.setDiscountMoney(orderMoney.subtract(new BigDecimal(saleOrder.getConvertedAmount())).setScale(2));
                 }
 
@@ -1026,7 +1071,7 @@ public class SaleOrderController {
 
 
                 String templateFilePath = uploadpath + templates.getTemplateFile();
-                String tempFilePath = uploadpath + "/"+ UUIDGenerator.generate()+".xlsx";
+                String tempFilePath = uploadpath + "/" + UUIDGenerator.generate() + ".xlsx";
 
                 try (ExcelWriter excelWriter = EasyExcel.write(tempFilePath).withTemplate(templateFilePath).build()) {
                     WriteSheet writeSheet = EasyExcel.writerSheet().build();
@@ -1035,9 +1080,9 @@ public class SaleOrderController {
                     excelWriter.fill(saleOrder, writeSheet);
                 }
                 List<String> noteList = new ArrayList<>();
-                productList.forEach(p->noteList.add(p.getNotes()));
+                productList.forEach(p -> noteList.add(p.getNotes()));
 
-                ExcelExportUtils.excelInsertRowNotes(getOutputStream(saleOrder.getBillCode()+".xlsx", response),
+                ExcelExportUtils.excelInsertRowNotes(getOutputStream(saleOrder.getBillCode() + ".xlsx", response),
                         tempFilePath, 17, noteList, 1, 3);
 
 
@@ -1047,6 +1092,7 @@ public class SaleOrderController {
 
         }
     }
+
     /**
      * 这是ExcelUtil.getOutputStream
      * 这里就是将文件下载交给了浏览器

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

@@ -119,6 +119,8 @@ public class SaleQuotationController {
     private IBaseProjectArchiveService baseProjectArchiveService;
     @Autowired
     private ISysDictService sysDictService;
+    @Autowired
+    private IBaseApproverHeadService approverHeadService;
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
@@ -264,11 +266,11 @@ public class SaleQuotationController {
         if (saleQuotationEntity == null) {
             return Result.error("未找到对应数据");
         }
-        // 1-已确认,0-未确认
+        // 1-已提交,0-未提交
         Integer submit = saleQuotationEntity.getStatus();
 
         if (submit == null || !submit.equals(1)) {
-            return Result.error("未确认的单据不能进行修订!");
+            return Result.error("未提交的单据不能进行修订!");
         }
 
         String version = saleQuotationEntity.getVersion();
@@ -324,11 +326,11 @@ public class SaleQuotationController {
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         SaleQuotation saleQuotation = saleQuotationService.getById(id);
-        // 1-已确认,0-未确认
+        // 1-已提交,0-未提交
         Integer submit = saleQuotation.getStatus();
 
         if (submit != null && submit.equals(1)) {
-            return Result.error("已确认的单据不能删除!");
+            return Result.error("已提交的单据不能删除!");
         }
 
         saleQuotationService.delMain(id);
@@ -351,12 +353,12 @@ public class SaleQuotationController {
         for (String o : ids.split(",")) {
 
             SaleQuotation saleQuotation = saleQuotationService.getById(o);
-            // 1-已确认,0-未确认
+            // 1-已提交,0-未提交
             Integer submit = saleQuotation.getStatus();
             String code = saleQuotation.getBillCode();
 
             if (submit != null && submit.equals(1)) {
-                return Result.error("单号" + code + "已确认,不能删除!");
+                return Result.error("单号" + code + "已提交,不能删除!");
             }
         }
 
@@ -366,13 +368,13 @@ public class SaleQuotationController {
 
 
     /**
-     * 批量确认
+     * 批量提交
      *
      * @param ids
      * @return
      */
-    @AutoLog(value = "销售报价单-批量确认")
-    @ApiOperation(value = "销售报价单-批量确认", notes = "销售报价单-批量确认")
+    @AutoLog(value = "销售报价单-批量提交")
+    @ApiOperation(value = "销售报价单-批量提交", notes = "销售报价单-批量提交")
     @GetMapping(value = "/submitBatch")
     public Result<String> submitBatch(@RequestParam(name = "ids", required = true) String ids) {
 
@@ -386,12 +388,12 @@ public class SaleQuotationController {
 
         StringBuffer sb = new StringBuffer();
         for (SaleQuotation o : list) {
-            // 1-已确认,0-未确认
+            // 1-已提交,0-未提交
             Integer submit = o.getStatus();
             String code = o.getBillCode();
 
             if (submit != null && submit.equals(1)) {
-                sb.append("单据编码" + code).append("已确认，请勿再次确认；");
+                sb.append("单据编码" + code).append("已提交，请勿再次提交；");
                 continue;
             }
         }
@@ -407,18 +409,24 @@ public class SaleQuotationController {
         ent.setConfirmBy(sysUser.getUsername());
         ent.setConfirmTime(new Date());
         saleQuotationService.update(ent, queryWrapper);
-
-        return Result.OK("确认成功！");
+        //String tableId, String orderType, String orderCode, String orderId
+//        for (SaleQuotation o : list) {
+//            String code = o.getBillCode();
+//
+//            approverHeadService.submitApprove("sale_quotation","销售报价单",code,o.getId());
+//        }
+
+        return Result.OK("提交成功！");
     }
 
     /**
-     * 批量取消确认
+     * 批量取消提交
      *
      * @param ids
      * @return
      */
-    @AutoLog(value = "销售报价单-批量取消确认")
-    @ApiOperation(value = "销售报价单-批量取消确认", notes = "销售报价单-批量取消确认")
+    @AutoLog(value = "销售报价单-批量取消提交")
+    @ApiOperation(value = "销售报价单-批量取消提交", notes = "销售报价单-批量取消提交")
     @GetMapping(value = "/returnSubmitBatch")
     public Result<String> returnSubmitBatch(@RequestParam(name = "ids", required = true) String ids) {
 
@@ -432,18 +440,18 @@ public class SaleQuotationController {
 
         StringBuffer sb = new StringBuffer();
         for (SaleQuotation o : list) {
-            //确认(1-是 ，0-否)
+            //提交(1-是 ，0-否)
             Integer submit = o.getStatus();
             String code = o.getBillCode();
             String version = o.getVersion();
 
             if (submit == null || submit.equals(0)) {
-                sb.append("单号" + code).append("已取消确认，请勿再次取消确认；");
+                sb.append("单号" + code).append("已取消提交，请勿再次取消提交；");
                 continue;
             }
 
             if (StringUtils.isNotBlank(version) && !version.equals("1")) {
-                sb.append("单号" + code).append("含有修订记录，无法取消确认；");
+                sb.append("单号" + code).append("含有修订记录，无法取消提交；");
                 continue;
             }
 
@@ -482,7 +490,11 @@ public class SaleQuotationController {
         ent.setStatus(0);
         saleQuotationService.update(ent, queryWrapper);
 
-        return Result.OK("取消确认成功！");
+//        for (SaleQuotation o : list) {
+//            approverHeadService.submitApproveReturn(o.getId());
+//        }
+
+        return Result.OK("取消提交成功！");
     }
 
 

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrder.java

@@ -28,6 +28,10 @@ import io.swagger.annotations.ApiModelProperty;
 public class SaleOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * b2b 1是 0否 -1是且已删除
+     */
+    private Integer b2b;
 	/**主键id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键id")
@@ -268,8 +272,10 @@ public class SaleOrder implements Serializable {
     private String phone;
     @TableField(exist = false)
     private String email;
-    @TableField(exist = false)
+
+    //船名称 新增字段
     private String shipName;
+
     @TableField(exist = false)
     private String imo;
     @TableField(exist = false)

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderHis.java

@@ -29,6 +29,10 @@ import io.swagger.annotations.ApiModelProperty;
 public class SaleOrderHis implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * b2b 1是 0否 -1是且已删除
+     */
+    private Integer b2b;
 	/**历史主键*/
 	@Excel(name = "历史主键", width = 15)
     @ApiModelProperty(value = "历史主键")

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderProduct.java

@@ -120,8 +120,11 @@ public class SaleOrderProduct implements Serializable {
     @Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
     private java.math.BigDecimal quantity;
-    @ApiModelProperty(value = "到货数量")
+
+    @ApiModelProperty(value = "已发货数量（发货单参照数量）")
     private java.math.BigDecimal deliveryQuantity;
+    @ApiModelProperty(value = "已采购数量（采购单参照数量）")
+    private java.math.BigDecimal purchaseQuantity;
 	/**税率(tax rate)*/
 	@Excel(name = "税率(tax rate)", width = 15)
     @ApiModelProperty(value = "税率(tax rate)")

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderProductHis.java

@@ -122,8 +122,11 @@ public class SaleOrderProductHis implements Serializable {
 	@Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
     private java.math.BigDecimal quantity;
-    @ApiModelProperty(value = "数量")
+
+    @ApiModelProperty(value = "已发货数量（发货单参照数量）")
     private java.math.BigDecimal deliveryQuantity;
+    @ApiModelProperty(value = "已采购数量（采购单参照数量）")
+    private java.math.BigDecimal purchaseQuantity;
 	/**税率(tax rate)*/
 	@Excel(name = "税率(tax rate)", width = 15)
     @ApiModelProperty(value = "税率(tax rate)")

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotation.java

@@ -60,9 +60,9 @@ public class SaleQuotation implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-	/**状态(1-已确认,0-未确认)*/
-	@Excel(name = "状态(1-已确认,0-未确认)", width = 15)
-    @ApiModelProperty(value = "状态(1-已确认,0-未确认)")
+	/**状态(1-已提交,0-未提交)*/
+	@Excel(name = "状态(1-已提交,0-未提交)", width = 15)
+    @ApiModelProperty(value = "状态(1-已提交,0-未提交)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
 	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
@@ -197,6 +197,10 @@ public class SaleQuotation implements Serializable {
     @ApiModelProperty(value = "交期")
     private String deliveryDayHead;
 
+    @Excel(name = "采购金额合计", width = 15)
+    private BigDecimal purchaseAmount;
+    @Excel(name = "销售金额合计", width = 15)
+    private BigDecimal saleAmount;
 
     //导出字段使用
     @TableField(exist = false)

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationHis.java

@@ -195,4 +195,9 @@ public class SaleQuotationHis implements Serializable {
     private BigDecimal exchangeRate;
     @ApiModelProperty(value = "交期")
     private String deliveryDayHead;
+
+    @Excel(name = "采购金额合计", width = 15)
+    private BigDecimal purchaseAmount;
+    @Excel(name = "销售金额合计", width = 15)
+    private BigDecimal saleAmount;
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationProduct.java

@@ -168,6 +168,9 @@ public class SaleQuotationProduct implements Serializable {
 	@Excel(name = "含税金额(tax amount)", width = 15)
     @ApiModelProperty(value = "含税金额(tax amount)")
     private java.math.BigDecimal taxAmount;
+
+    @ApiModelProperty(value = "采购金额(purchase Amount)")
+    private java.math.BigDecimal purchaseAmount;
 	/**备注(notes)*/
 	@Excel(name = "备注(notes)", width = 15)
     @ApiModelProperty(value = "备注(notes)")

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationProductHis.java

@@ -178,6 +178,8 @@ public class SaleQuotationProductHis implements Serializable {
 	@Excel(name = "含税金额(tax amount)", width = 15)
     @ApiModelProperty(value = "含税金额(tax amount)")
     private java.math.BigDecimal taxAmount;
+    @ApiModelProperty(value = "采购金额(purchase Amount)")
+    private java.math.BigDecimal purchaseAmount;
 	/**备注(notes)*/
 	@Excel(name = "备注(notes)", width = 15)
     @ApiModelProperty(value = "备注(notes)")

srm-module-code/src/main/java/org/jeecg/modules/saleCode/mapper/xml/SaleOrderProductMapper.xml

@@ -51,6 +51,8 @@
 					 , b.notes childNotes
 					 , b.supplier_id
 					 , b.supplier_name
+					 , b.purchase_quantity
+					 , b.delivery_quantity
 
 				from sale_order a
 						 left join sale_order_product b on a.id = b.head_id

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleDeliveryServiceImpl.java

@@ -93,7 +93,7 @@ public class SaleDeliveryServiceImpl extends ServiceImpl<SaleDeliveryMapper, Sal
                 String sourceId = entity.getSourceId();
                 if (StringUtils.isNotBlank(sourceId)) {
 
-                    BigDecimal deliveryQuantity = entity.getDeliveryQuantity() == null ? BigDecimal.ZERO : entity.getDeliveryQuantity();//入库数量
+                    BigDecimal deliveryQuantity = entity.getQuantity() == null ? BigDecimal.ZERO : entity.getQuantity();//数量
                     SaleOrderProduct arrival = saleOrderProductMapper.selectById(sourceId);
 
                     if (arrival != null) {

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleInvoiceServiceImpl.java

@@ -1,13 +1,15 @@
 package org.jeecg.modules.saleCode.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
-import org.jeecg.modules.saleCode.entity.SaleInvoice;
-import org.jeecg.modules.saleCode.entity.SaleInvoiceShip;
-import org.jeecg.modules.saleCode.entity.SaleInvoiceProduct;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.saleCode.entity.*;
 import org.jeecg.modules.saleCode.mapper.SaleInvoiceShipMapper;
 import org.jeecg.modules.saleCode.mapper.SaleInvoiceProductMapper;
 import org.jeecg.modules.saleCode.mapper.SaleInvoiceMapper;
+import org.jeecg.modules.saleCode.service.ISaleDeliveryService;
 import org.jeecg.modules.saleCode.service.ISaleInvoiceService;
+import org.jeecg.modules.saleCode.service.ISaleOrderService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,20 +34,24 @@ public class SaleInvoiceServiceImpl extends ServiceImpl<SaleInvoiceMapper, SaleI
 	private SaleInvoiceShipMapper saleInvoiceShipMapper;
 	@Autowired
 	private SaleInvoiceProductMapper saleInvoiceProductMapper;
+	@Autowired
+	private ISaleDeliveryService saleDeliveryService;
+	@Autowired
+	private ISaleOrderService saleOrderService;
 	
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveMain(SaleInvoice saleInvoice, List<SaleInvoiceShip> saleInvoiceShipList,List<SaleInvoiceProduct> saleInvoiceProductList) {
 
-		String sourceCode = saleInvoice.getSourceCode();
-		String sourceCode2 = saleInvoice.getSourceCode2();
-
-		if(StringUtils.isNotBlank(sourceCode)){
-			saleInvoice.setOrderNumber(sourceCode);
-		}
-		if(StringUtils.isNotBlank(sourceCode2)){
-			saleInvoice.setOrderNumber(sourceCode2);
-		}
+//		String sourceCode = saleInvoice.getSourceCode();
+//		String sourceCode2 = saleInvoice.getSourceCode2();
+//
+//		if(StringUtils.isNotBlank(sourceCode)){
+//			saleInvoice.setOrderNumber(sourceCode);
+//		}
+//		if(StringUtils.isNotBlank(sourceCode2)){
+//			saleInvoice.setOrderNumber(sourceCode2);
+//		}
 
 		BigDecimal taxMoneyHead = BigDecimal.ZERO;
 		//计算表头金额合计
@@ -58,6 +64,28 @@ public class SaleInvoiceServiceImpl extends ServiceImpl<SaleInvoiceMapper, SaleI
 		}
 
 		saleInvoice.setTaxMoney(taxMoneyHead);
+
+		if (oConvertUtils.isNotEmpty(saleInvoice.getSourceCode())) {
+			LambdaQueryWrapper<SaleDelivery> deliveryLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			deliveryLambdaQueryWrapper.eq(SaleDelivery::getBillCode, saleInvoice.getSourceCode());
+			SaleDelivery delivery = saleDeliveryService.getOne(deliveryLambdaQueryWrapper);
+			if (delivery != null){
+				String orderCode = delivery.getSourceCode();
+
+				// 获取销售订单
+				if (oConvertUtils.isNotEmpty(orderCode)){
+					LambdaQueryWrapper<SaleOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+					orderLambdaQueryWrapper.eq(SaleOrder::getBillCode, orderCode);
+					SaleOrder saleOrder = saleOrderService.getOne(orderLambdaQueryWrapper);
+					if (saleOrder != null){
+						// 客户订单号
+						saleInvoice.setOrderNumber(saleOrder.getCustomerOrder());
+					}
+				}
+			}
+		}
+
+
 		saleInvoiceMapper.insert(saleInvoice);
 		if(saleInvoiceShipList!=null && saleInvoiceShipList.size()>0) {
 			for(SaleInvoiceShip entity:saleInvoiceShipList) {
@@ -80,6 +108,40 @@ public class SaleInvoiceServiceImpl extends ServiceImpl<SaleInvoiceMapper, SaleI
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateMain(SaleInvoice saleInvoice,List<SaleInvoiceShip> saleInvoiceShipList,List<SaleInvoiceProduct> saleInvoiceProductList) {
+
+		BigDecimal taxMoneyHead = BigDecimal.ZERO;
+		//计算表头金额合计
+		if(saleInvoiceProductList!=null && saleInvoiceProductList.size()>0) {
+			for(SaleInvoiceProduct entity:saleInvoiceProductList) {
+
+				BigDecimal taxMoney = entity.getTaxMoney();
+				taxMoneyHead = taxMoneyHead.add(taxMoney);
+			}
+		}
+
+		saleInvoice.setTaxMoney(taxMoneyHead);
+
+
+		if (oConvertUtils.isNotEmpty(saleInvoice.getSourceCode())) {
+			LambdaQueryWrapper<SaleDelivery> deliveryLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			deliveryLambdaQueryWrapper.eq(SaleDelivery::getBillCode, saleInvoice.getSourceCode());
+			SaleDelivery delivery = saleDeliveryService.getOne(deliveryLambdaQueryWrapper);
+			if (delivery != null){
+				String orderCode = delivery.getSourceCode();
+
+				// 获取销售订单
+				if (oConvertUtils.isNotEmpty(orderCode)){
+					LambdaQueryWrapper<SaleOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+					orderLambdaQueryWrapper.eq(SaleOrder::getBillCode, orderCode);
+					SaleOrder saleOrder = saleOrderService.getOne(orderLambdaQueryWrapper);
+					if (saleOrder != null){
+						// 客户订单号
+						saleInvoice.setOrderNumber(saleOrder.getCustomerOrder());
+					}
+				}
+			}
+		}
+
 		saleInvoiceMapper.updateById(saleInvoice);
 		
 		//1.先删除子表数据

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleOrderServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 销售订单
@@ -34,6 +35,12 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveMain(SaleOrder saleOrder, List<SaleOrderShip> saleOrderShipList,List<SaleOrderProduct> saleOrderProductList) {
+
+		if(saleOrderShipList!=null && saleOrderShipList.size()>0) {
+			String names = saleOrderShipList.stream().map(SaleOrderShip::getShipName).collect(Collectors.joining(","));
+			saleOrder.setShipName(names);
+		}
+
 		saleOrderMapper.insert(saleOrder);
 		if(saleOrderShipList!=null && saleOrderShipList.size()>0) {
 			for(SaleOrderShip entity:saleOrderShipList) {
@@ -56,6 +63,11 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateMain(SaleOrder saleOrder,List<SaleOrderShip> saleOrderShipList,List<SaleOrderProduct> saleOrderProductList) {
+
+		if(saleOrderShipList!=null && saleOrderShipList.size()>0) {
+			String names = saleOrderShipList.stream().map(SaleOrderShip::getShipName).collect(Collectors.joining(","));
+			saleOrder.setShipName(names);
+		}
 		saleOrderMapper.updateById(saleOrder);
 		
 		//1.先删除子表数据

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleQuotationServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Collection;
@@ -35,6 +36,23 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveMain(SaleQuotation saleQuotation, List<SaleQuotationShip> saleQuotationShipList,List<SaleQuotationProduct> saleQuotationProductList) {
+
+		BigDecimal purchaseAmount = BigDecimal.ZERO;
+		BigDecimal saleAmount = BigDecimal.ZERO;
+
+		if(saleQuotationProductList!=null && saleQuotationProductList.size()>0) {
+			for(SaleQuotationProduct entity:saleQuotationProductList) {
+				BigDecimal getPurchaseAmount = entity.getPurchaseAmount() == null ?BigDecimal.ZERO :entity.getPurchaseAmount();
+				BigDecimal getTaxAmount = entity.getTaxAmount() == null ?BigDecimal.ZERO :entity.getTaxAmount();
+
+				purchaseAmount = purchaseAmount.add(getPurchaseAmount);
+				saleAmount = saleAmount.add(getTaxAmount);
+
+			}
+		}
+		saleQuotation.setPurchaseAmount(purchaseAmount);
+		saleQuotation.setSaleAmount(saleAmount);
+
 		saleQuotationMapper.insert(saleQuotation);
 		if(saleQuotationShipList!=null && saleQuotationShipList.size()>0) {
 			for(SaleQuotationShip entity:saleQuotationShipList) {
@@ -57,6 +75,23 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateMain(SaleQuotation saleQuotation,List<SaleQuotationShip> saleQuotationShipList,List<SaleQuotationProduct> saleQuotationProductList) {
+
+		BigDecimal purchaseAmount = BigDecimal.ZERO;
+		BigDecimal saleAmount = BigDecimal.ZERO;
+
+		if(saleQuotationProductList!=null && saleQuotationProductList.size()>0) {
+			for(SaleQuotationProduct entity:saleQuotationProductList) {
+				BigDecimal getPurchaseAmount = entity.getPurchaseAmount() == null ?BigDecimal.ZERO :entity.getPurchaseAmount();
+				BigDecimal getTaxAmount = entity.getTaxAmount() == null ?BigDecimal.ZERO :entity.getTaxAmount();
+
+				purchaseAmount = purchaseAmount.add(getPurchaseAmount);
+				saleAmount = saleAmount.add(getTaxAmount);
+
+			}
+		}
+		saleQuotation.setPurchaseAmount(purchaseAmount);
+		saleQuotation.setSaleAmount(saleAmount);
+
 		saleQuotationMapper.updateById(saleQuotation);
 		
 		//1.先删除子表数据

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

@@ -296,7 +296,7 @@ public class SaleOrderAlert implements Serializable {
     /**数量*/
     @Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
-    private Double quantity;
+    private java.math.BigDecimal quantity;
     /**税率(tax rate)*/
     @Excel(name = "税率(tax rate)", width = 15)
     @ApiModelProperty(value = "税率(tax rate)")
@@ -333,4 +333,9 @@ public class SaleOrderAlert implements Serializable {
     private String currencyGys;//供应商币种
     private BigDecimal exchangeRateGys;//美元汇率
     private BigDecimal taxPriceGys;//供应商采购单价
+
+    @ApiModelProperty(value = "已发货数量（发货单参照数量）")
+    private java.math.BigDecimal deliveryQuantity;
+    @ApiModelProperty(value = "已采购数量（采购单参照数量）")
+    private java.math.BigDecimal purchaseQuantity;
 }

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

@@ -27,6 +27,10 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="sale_order_hisPage对象", description="销售订单（历史表）")
 public class SaleOrderHisPage {
 
+	/**
+	 * b2b 1是 0否 -1是且已删除
+	 */
+	private Integer b2b;
 	/**历史主键*/
 	@Excel(name = "历史主键", width = 15)
 	@ApiModelProperty(value = "历史主键")

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

@@ -27,6 +27,10 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="sale_orderPage对象", description="销售订单")
 public class SaleOrderPage {
 
+	/**
+	 * b2b 1是 0否 -1是且已删除
+	 */
+	private Integer b2b;
 	/**主键id*/
 	@ApiModelProperty(value = "主键id")
     private String id;

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

@@ -192,6 +192,10 @@ public class SaleQuotationHisPage {
     private String send;
 	@ApiModelProperty(value = "交期")
 	private String deliveryDayHead;
+	@Excel(name = "采购金额合计", width = 15)
+	private BigDecimal purchaseAmount;
+	@Excel(name = "销售金额合计", width = 15)
+	private BigDecimal saleAmount;
 
 	@Excel(name = "汇率(exchangeRate)", width = 15)
 	private BigDecimal exchangeRate;

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

@@ -59,9 +59,9 @@ public class SaleQuotationPage {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间")
     private Date updateTime;
-	/**状态(1-已确认,0-未确认)*/
-	@Excel(name = "状态(1-已确认,0-未确认)", width = 15)
-	@ApiModelProperty(value = "状态(1-已确认,0-未确认)")
+	/**状态(1-已提交,0-未提交)*/
+	@Excel(name = "状态(1-已提交,0-未提交)", width = 15)
+	@ApiModelProperty(value = "状态(1-已提交,0-未提交)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
 	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
@@ -189,6 +189,10 @@ public class SaleQuotationPage {
 	private BigDecimal exchangeRate;
 	@ApiModelProperty(value = "交期")
 	private String deliveryDayHead;
+	@Excel(name = "采购金额合计", width = 15)
+	private BigDecimal purchaseAmount;
+	@Excel(name = "销售金额合计", width = 15)
+	private BigDecimal saleAmount;
 
 	private String sourceCode;
 	@ExcelCollection(name="销售报价单-船明细")

srm-module-code/src/main/java/org/jeecg/modules/storeCode/controller/StoreOnhandController.java

@@ -13,9 +13,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.storeCode.entity.StoreOnhand;
@@ -209,7 +211,59 @@ public class StoreOnhandController extends JeecgController<StoreOnhand, IStoreOn
     @RequiresPermissions("storeCode:store_onhand:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, StoreOnhand storeOnhand) {
-        return super.exportXls(request, storeOnhand, StoreOnhand.class, "现存量");
+        return exportXls(request, storeOnhand, StoreOnhand.class, "现存量");
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     */
+    protected ModelAndView exportXls(HttpServletRequest request, StoreOnhand object, Class<StoreOnhand> clazz, String title) {
+
+
+        BigDecimal keyspace = null;
+        if(object.getQuantity() !=null){
+            keyspace = object.getQuantity();
+        }
+        object.setQuantity(null);
+
+        // Step.1 组装查询条件
+        QueryWrapper<StoreOnhand> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        if(keyspace != null){
+
+            if(keyspace.compareTo(BigDecimal.ONE) == 0 ){
+                queryWrapper.gt("quantity",0);
+            }
+
+            if(keyspace.compareTo(BigDecimal.ZERO) == 0 ){
+                queryWrapper.lt("quantity",0.0000000001);
+            }
+
+        }
+
+        // 过滤选中数据
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id",selectionList);
+        }
+        // Step.2 获取导出数据
+        List<StoreOnhand> exportList = service.list(queryWrapper);
+
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
     }
 
     /**

srm-module-code/src/main/java/org/jeecg/modules/storeCode/entity/StoreOnhand.java

@@ -57,11 +57,12 @@ public class StoreOnhand implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
+    @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -70,53 +71,54 @@ public class StoreOnhand implements Serializable {
     @ApiModelProperty(value = "仓库(warehouse)")
     private String warehouse;
 	/**仓库名称*/
-	@Excel(name = "仓库名称", width = 15)
+//	@Excel(name = "仓库名称", width = 15)
     @ApiModelProperty(value = "仓库名称")
     private String warehouseName;
 	/**货位(goods allocation)*/
-	@Excel(name = "货位(goods allocation)", width = 15)
+	@Excel(name = "货位(goods allocation)", width = 20)
     @ApiModelProperty(value = "货位(goods allocation)")
     private String goodsAllocation;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+//	@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
-	@Excel(name = "项目名称", width = 15)
+	@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 	/**供应商(supplier)*/
-	@Excel(name = "供应商(supplier)", width = 15)
+//	@Excel(name = "供应商(supplier)", width = 15)
     @ApiModelProperty(value = "供应商(supplier)")
     private String supplier;
 	/**供应商名称*/
-	@Excel(name = "供应商名称", width = 15)
+	@Excel(name = "供应商名称(supplier)", width = 25)
     @ApiModelProperty(value = "供应商名称")
     private String supplierName;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+//	@Excel(name = "产品分类(production class)", width = 15)
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;
+    @Excel(name = "产品分类(production class)", width = 25)
     private String productionClassName;
 	/**厂家(maker)*/
-	@Excel(name = "厂家(maker)", width = 15)
+	@Excel(name = "厂家(maker)", width = 30)
     @ApiModelProperty(value = "厂家(maker)")
     private String maker;
 	/**产品id*/
-	@Excel(name = "产品id", width = 15)
+//	@Excel(name = "产品id", width = 15)
     @ApiModelProperty(value = "产品id")
     private String productId;
     /**产品编码*/
-    @Excel(name = "产品编码", width = 15)
+    @Excel(name = "产品编码(product code)", width = 15)
     @ApiModelProperty(value = "产品编码")
     private String productCode;
 	/**产品中文名(chinese name)*/
-	@Excel(name = "产品中文名(chinese name)", width = 15)
+	@Excel(name = "产品中文名(chinese name)", width = 25)
     @ApiModelProperty(value = "产品中文名(chinese name)")
     private String chineseName;
 	/**产品英文名*/
-	@Excel(name = "产品英文名", width = 15)
+	@Excel(name = "产品英文名", width = 30)
     @ApiModelProperty(value = "产品英文名")
     private String englishName;
 	/**规格*/
@@ -150,28 +152,24 @@ public class StoreOnhand implements Serializable {
 	@Excel(name = "质量等级", width = 15)
     @ApiModelProperty(value = "质量等级")
     private String qualityGrade;
-	/**批号(batch code)*/
-	@Excel(name = "批号(batch code)", width = 15)
-    @ApiModelProperty(value = "批号(batch code)")
-    private String batchCode;
 	/**数量(quantity)*/
 	@Excel(name = "数量(quantity)", width = 15)
     @ApiModelProperty(value = "数量(quantity)")
     private BigDecimal quantity;
+    /**批号(batch code)*/
+    @Excel(name = "编号(batch code)", width = 15)
+    @ApiModelProperty(value = "批号(batch code)")
+    private String batchCode;
 	/**初始数量*/
-	@Excel(name = "初始数量", width = 15)
     @ApiModelProperty(value = "初始数量")
     private BigDecimal initialQuantity;
 	/**来源主键（来源子表）*/
-	@Excel(name = "来源主键（来源子表）", width = 15)
     @ApiModelProperty(value = "来源主键（来源子表）")
     private String sourceId;
 	/**来源编号（入库单）*/
-	@Excel(name = "来源编号（入库单）", width = 15)
     @ApiModelProperty(value = "来源编号（入库单）")
     private String sourceCode;
 	/**入库日期*/
-	@Excel(name = "入库日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "入库日期")

srm-module-code/src/main/java/org/jeecg/modules/storeCode/service/impl/StoreSaleOutServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.saleCode.entity.SaleDeliveryDetails;
+import org.jeecg.modules.saleCode.mapper.SaleDeliveryDetailsMapper;
 import org.jeecg.modules.storeCode.entity.StoreOnhand;
 import org.jeecg.modules.storeCode.entity.StoreSaleOut;
 import org.jeecg.modules.storeCode.entity.StoreSaleOutShip;
@@ -42,6 +44,8 @@ public class StoreSaleOutServiceImpl extends ServiceImpl<StoreSaleOutMapper, Sto
     private StoreSaleOutDetailsMapper storeSaleOutDetailsMapper;
     @Autowired
     private IStoreOnhandService storeOnhandService;
+    @Autowired
+    private SaleDeliveryDetailsMapper saleDeliveryDetailsMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -92,6 +96,27 @@ public class StoreSaleOutServiceImpl extends ServiceImpl<StoreSaleOutMapper, Sto
                 }
 
 
+                String sourceId = entity.getSourceId();
+                if (StringUtils.isNotBlank(sourceId)) {
+
+                    SaleDeliveryDetails saleDeliveryDetails = saleDeliveryDetailsMapper.selectById(sourceId);
+
+                    if (saleDeliveryDetails != null) {
+
+                        BigDecimal arrivalQuantity = saleDeliveryDetails.getDeliveryQuantity() == null ? BigDecimal.ZERO : saleDeliveryDetails.getDeliveryQuantity();//已出库数量
+
+                        arrivalQuantity = arrivalQuantity.add(stockOutQuantity);
+                        saleDeliveryDetails.setDeliveryQuantity(arrivalQuantity);
+
+                        if(arrivalQuantity.compareTo(saleDeliveryDetails.getQuantity()) > 0){
+                            throw new JeecgBootException(entity.getProductCode()+entity.getEnglishName()+"发货单数量不足,请修改出库数量（已出库数量："+saleDeliveryDetails.getDeliveryQuantity()+"）");
+                        }
+
+                        saleDeliveryDetailsMapper.updateById(saleDeliveryDetails);
+                    }
+
+                }
+
                 //外键设置
                 entity.setId(null);
                 entity.setHeadId(storeSaleOut.getId());
@@ -103,6 +128,39 @@ public class StoreSaleOutServiceImpl extends ServiceImpl<StoreSaleOutMapper, Sto
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateMain(StoreSaleOut storeSaleOut, List<StoreSaleOutShip> storeSaleOutShipList, List<StoreSaleOutDetails> storeSaleOutDetailsList) {
+
+        List<StoreSaleOutDetails> detailsList = storeSaleOutDetailsMapper.selectByMainId(storeSaleOut.getId());
+        if (detailsList != null && detailsList.size() > 0) {
+
+            for (StoreSaleOutDetails entity : detailsList) {
+
+                String sourceId = entity.getSourceId();
+                if (StringUtils.isNotBlank(sourceId)) {
+
+                    BigDecimal stockOutQuantity = entity.getStockOutQuantity()==null?BigDecimal.ZERO:entity.getStockOutQuantity();
+
+                    SaleDeliveryDetails saleDeliveryDetails = saleDeliveryDetailsMapper.selectById(sourceId);
+
+                    if (saleDeliveryDetails != null) {
+                        BigDecimal arrivalQuantity = saleDeliveryDetails.getDeliveryQuantity() == null ? BigDecimal.ZERO : saleDeliveryDetails.getDeliveryQuantity();//已出库数量
+
+                        arrivalQuantity = arrivalQuantity.subtract(stockOutQuantity);
+
+                        if (arrivalQuantity.compareTo(BigDecimal.ZERO) < 1) {
+                            saleDeliveryDetails.setDeliveryQuantity(BigDecimal.ZERO);
+                        } else {
+
+                            saleDeliveryDetails.setDeliveryQuantity(arrivalQuantity);
+                        }
+                        saleDeliveryDetailsMapper.updateById(saleDeliveryDetails);
+
+                    }
+
+                }
+            }
+        }
+
+
         storeSaleOutMapper.updateById(storeSaleOut);
 
         String project = storeSaleOut.getProject();
@@ -155,6 +213,27 @@ public class StoreSaleOutServiceImpl extends ServiceImpl<StoreSaleOutMapper, Sto
 
                 }
 
+
+                String sourceId = entity.getSourceId();
+                if (StringUtils.isNotBlank(sourceId)) {
+
+                    SaleDeliveryDetails saleDeliveryDetails = saleDeliveryDetailsMapper.selectById(sourceId);
+
+                    if (saleDeliveryDetails != null) {
+
+                        BigDecimal arrivalQuantity = saleDeliveryDetails.getDeliveryQuantity() == null ? BigDecimal.ZERO : saleDeliveryDetails.getDeliveryQuantity();//已出库数量
+
+                        arrivalQuantity = arrivalQuantity.add(stockOutQuantity);
+                        saleDeliveryDetails.setDeliveryQuantity(arrivalQuantity);
+
+                        if(arrivalQuantity.compareTo(saleDeliveryDetails.getQuantity()) > 0){
+                            throw new JeecgBootException(entity.getProductCode()+entity.getEnglishName()+"发货单数量不足,请修改出库数量（已出库数量："+saleDeliveryDetails.getDeliveryQuantity()+"）");
+                        }
+                        saleDeliveryDetailsMapper.updateById(saleDeliveryDetails);
+                    }
+
+                }
+
                 //外键设置
                 entity.setId(null);
                 entity.setHeadId(storeSaleOut.getId());
@@ -166,6 +245,38 @@ public class StoreSaleOutServiceImpl extends ServiceImpl<StoreSaleOutMapper, Sto
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delMain(String id) {
+
+        List<StoreSaleOutDetails> detailsList = storeSaleOutDetailsMapper.selectByMainId(id);
+        if (detailsList != null && detailsList.size() > 0) {
+
+            for (StoreSaleOutDetails entity : detailsList) {
+
+                String sourceId = entity.getSourceId();
+                if (StringUtils.isNotBlank(sourceId)) {
+
+                    BigDecimal stockOutQuantity = entity.getStockOutQuantity()==null?BigDecimal.ZERO:entity.getStockOutQuantity();
+
+                    SaleDeliveryDetails saleDeliveryDetails = saleDeliveryDetailsMapper.selectById(sourceId);
+
+                    if (saleDeliveryDetails != null) {
+                        BigDecimal arrivalQuantity = saleDeliveryDetails.getDeliveryQuantity() == null ? BigDecimal.ZERO : saleDeliveryDetails.getDeliveryQuantity();//已出库数量
+
+                        arrivalQuantity = arrivalQuantity.subtract(stockOutQuantity);
+
+                        if (arrivalQuantity.compareTo(BigDecimal.ZERO) < 1) {
+                            saleDeliveryDetails.setDeliveryQuantity(BigDecimal.ZERO);
+                        } else {
+
+                            saleDeliveryDetails.setDeliveryQuantity(arrivalQuantity);
+                        }
+                        saleDeliveryDetailsMapper.updateById(saleDeliveryDetails);
+
+                    }
+
+                }
+            }
+        }
+
         storeSaleOutShipMapper.deleteByMainId(id);
         storeSaleOutDetailsMapper.deleteByMainId(id);
         storeSaleOutMapper.deleteById(id);
@@ -175,6 +286,39 @@ public class StoreSaleOutServiceImpl extends ServiceImpl<StoreSaleOutMapper, Sto
     @Transactional(rollbackFor = Exception.class)
     public void delBatchMain(Collection<? extends Serializable> idList) {
         for (Serializable id : idList) {
+
+
+            List<StoreSaleOutDetails> detailsList = storeSaleOutDetailsMapper.selectByMainId(id.toString());
+            if (detailsList != null && detailsList.size() > 0) {
+
+                for (StoreSaleOutDetails entity : detailsList) {
+
+                    String sourceId = entity.getSourceId();
+                    if (StringUtils.isNotBlank(sourceId)) {
+
+                        BigDecimal stockOutQuantity = entity.getStockOutQuantity()==null?BigDecimal.ZERO:entity.getStockOutQuantity();
+
+                        SaleDeliveryDetails saleDeliveryDetails = saleDeliveryDetailsMapper.selectById(sourceId);
+
+                        if (saleDeliveryDetails != null) {
+                            BigDecimal arrivalQuantity = saleDeliveryDetails.getDeliveryQuantity() == null ? BigDecimal.ZERO : saleDeliveryDetails.getDeliveryQuantity();//已出库数量
+
+                            arrivalQuantity = arrivalQuantity.subtract(stockOutQuantity);
+
+                            if (arrivalQuantity.compareTo(BigDecimal.ZERO) < 1) {
+                                saleDeliveryDetails.setDeliveryQuantity(BigDecimal.ZERO);
+                            } else {
+
+                                saleDeliveryDetails.setDeliveryQuantity(arrivalQuantity);
+                            }
+                            saleDeliveryDetailsMapper.updateById(saleDeliveryDetails);
+
+                        }
+
+                    }
+                }
+            }
+
             storeSaleOutShipMapper.deleteByMainId(id.toString());
             storeSaleOutDetailsMapper.deleteByMainId(id.toString());
             storeSaleOutMapper.deleteById(id);

srm-module-code/src/main/java/org/jeecg/modules/storeCode/vo/StorePurchaseInAlert.java

@@ -27,6 +27,7 @@ import java.util.Date;
 public class StorePurchaseInAlert implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private String id;
     private String headId;
     private String childId;
 	/**创建人*/