添加了报价单的数据

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRemainder.java

@@ -35,4 +35,9 @@ public class AccountRemainder extends BasePo {
      */
     private BigDecimal remainder;
 
+    /**
+     * 变更-余额
+     */
+    private BigDecimal changeRemainder;
+
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -160,7 +160,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
 
         //添加附件信息
         ObsFileUtil.saveFile(accountPaymentDto.getFileList(),accountPaymentDto.getId());
-
+        accountRemainder.setChangeRemainder(accountPaymentDto.getAmount());
         //修改账户-余额表的中余额
         accountRemainder.setRemainder( accountRemainder.getRemainder().subtract(accountPaymentDto.getAmount()));
         accountRemainderService.add(accountRemainder);

hx-account/src/main/resources/mapper/account/AccountRemainderMapper.xml

@@ -7,6 +7,7 @@
             ar.account_management_id,
             ar.currency,
             ar.remainder,
+            ar.change_remainder,
             ar.create_user,
             ar.create_time,
             ar.update_user,

hx-mes/src/main/java/com/fjhx/mes/controller/work/WorkOrderController.java

@@ -2,6 +2,7 @@ package com.fjhx.mes.controller.work;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.mes.entity.work.po.WorkOrder;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.mes.entity.work.vo.WorkOrderVo;
@@ -11,13 +12,15 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.mes.service.work.WorkOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 
 /**
  * <p>
  * 工单 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-29
  */
 @DS(SourceConstant.MES)
@@ -53,6 +56,14 @@ public class WorkOrderController {
     }
 
     /**
+     * 工单批量新增
+     */
+    @PostMapping("/addBatch")
+    public void addBatch(@RequestBody List<WorkOrder> workOrderDtoList) {
+        workOrderService.addBatch(workOrderDtoList);
+    }
+
+    /**
      * 工单编辑
      */
     @PostMapping("/edit")

hx-mes/src/main/java/com/fjhx/mes/entity/work/po/WorkOrder.java

@@ -28,7 +28,7 @@ public class WorkOrder extends BasePo {
     private String code;
 
     /**
-     * 工单来源
+     * 工单来源Id
      */
     private Long sourceId;
 

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  * 外销合同-产品 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-17
  */
 @Service

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -5,10 +5,11 @@
         SELECT
             t1.id,
             t1.contract_id,
+            t1.product_id,
             t2.`code` AS contractCode,
             t2.user_name AS userName,
             t2.version AS contractVersion,
-            t1.expendQuantity,
+            t1.expend_quantity expendQuantity,
             (SELECT create_time FROM claim_contract WHERE contract_id = t2.id ORDER BY create_time DESC LIMIT 1 ) AS claimTime
         FROM
             contract_product t1

hx-sale/src/main/resources/mapper/pack/PackShipmentMapper.xml

@@ -24,6 +24,7 @@
     </select>
     <select id="productDetailList" resultType="java.util.Map">
         SELECT
+            id  as businessId,
             remark,
             null as subDescription,
             null as customsCode,
@@ -37,6 +38,7 @@
         </where>
         UNION
         SELECT
+            id  as businessId,
             product_name remark,
             null as subDescription,
             null as customsCode,