oms与bms修改

2026-04-17 09:29:27 +08:00
parent 4ca0f10e61
commit 3d4907f49c
12 changed files with 67 additions and 8 deletions
@@ -2,6 +2,7 @@ package com.mhd.bms.domain.bmsInvoiceList.repository.persistence;

 import cn.hutool.core.util.ObjectUtil;
 import com.aliyun.oss.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -184,12 +185,22 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
            }
        }

-        BillManage billManage = billManageMapper.selectById(bmsInvoiceListAddDTO.getBillManageId());
-        if (billManage != null) {
-            billManage.setIsInvoice(1);
-            billManage.setInvoiceId(bmsInvoiceList.getId().toString());
-            billManage.setApplyNumber(bmsInvoiceList.getApplyNumber());
-            billManageMapper.updateById(billManage);
+//        BillManage billManage = billManageMapper.selectById(bmsInvoiceListAddDTO.getBillManageId());
+//        if (billManage != null) {
+//            billManage.setIsInvoice(1);
+//            billManage.setInvoiceId(bmsInvoiceList.getId().toString());
+//            billManage.setApplyNumber(bmsInvoiceList.getApplyNumber());
+//            billManageMapper.updateById(billManage);
+//        }
+        List<Long> billManageIds = bmsInvoiceListAddDTO.getBillManageIds();
+        List<BillManage> billManages = billManageMapper.selectList(new LambdaQueryWrapper<BillManage>().in(BillManage::getBillManageId, billManageIds));
+        if (billManages != null && billManages.size() > 0) {
+        for (BillManage billManage : billManages) {
+                billManage.setIsInvoice(1);
+                billManage.setInvoiceId(bmsInvoiceList.getId().toString());
+                billManage.setApplyNumber(bmsInvoiceList.getApplyNumber());
+                billManageMapper.updateById(billManage);
+            }
        }
        /*AjaxResult ajaxResult = financeServiceFeign.editIsInvoice(transportationId,1,bmsInvoiceList.getId(),"",bmsInvoiceList.getApplyNumber());
        if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
@@ -466,6 +477,19 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
        //bmsInvoiceList.setUpdateBy(sysUser.getId());
        bmsInvoiceList.setUpdateTime(new Date());
        this.updateById(bmsInvoiceList);
+        Long id = bmsInvoiceList.getId();
+        List<BillManage> billManages = billManageMapper.selectList(new QueryWrapper<BillManage>().lambda().eq(BillManage::getInvoiceId, id.toString()));
+        if (ObjectUtil.isNotNull(billManages) && billManages.size() > 0) {
+            for (BillManage billManage : billManages) {
+                if (bmsInvoiceListInvoiceStateDTO.getInvoiceState() ==5){
+                    billManage.setIsInvoice(5);
+                }
+               if (bmsInvoiceListInvoiceStateDTO.getInvoiceState() == 3){
+                   billManage.setIsInvoice(4);
+               }
+                billManageMapper.updateById(billManage);
+            }
+        }
        return bmsInvoiceList.getInvoiceState();
    }

@@ -76,5 +76,8 @@ public class BmsInvoiceListAddDTO implements Serializable {
    private String settlementEntity;

    private List<BmsMakeOutInvoice> bmsMakeOutInvoices;
+    @ApiModelProperty(value = "对账单id列表")
+    @Excel(name = "对账单id列表", width = 15)
+    private List<Long> billManageIds;

 }
@@ -144,8 +144,14 @@
        a.tracking_number,
        a.apply_number,
        a.company_name as companyName,
-        b.bill_number as billNumber,
-        b.bill_manage_id as billManageId,
+--         b.bill_number as billNumber,
+--         b.bill_manage_id as billManageId,
+       (SELECT LISTAGG(bill_number, ', ') WITHIN GROUP (ORDER BY bill_number)
+         FROM BILL_MANAGE b_sub
+         WHERE b_sub.apply_number = a.apply_number) as billNumber,
+        (SELECT LISTAGG(bill_manage_id, ', ') WITHIN GROUP (ORDER BY bill_manage_id)
+         FROM BILL_MANAGE b_sub
+         WHERE b_sub.apply_number = a.apply_number) as billManageId,
        a.SETTLEMENT_CURRENCY as settlementCurrency,
        a.organization_id AS organizationId,
        a.organization_name AS organizationName,
@@ -741,6 +741,9 @@ public class BusinessDocumentOrder extends BaseVOEntity{
    @ApiModelProperty(value = "订单来源")
    private String orderSource;

+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+

    @ApiModelProperty(value = "出入库单号")
    private String entryNumber;
@@ -182,6 +182,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                    ExecuteOrderDO executeOrderDO=new ExecuteOrderDO();
                    BeanUtils.copyProperties(businessDocumentOrder,executeOrderDO);
                    executeOrderDO.setDocumentDate(businessDocumentOrder.getDocumentDate());
+                    executeOrderDO.setLayDate(businessDocumentOrder.getLayDate());
                    executeOrderDO.setBusinessDocumentId(id);
                    executeOrderDO.setBusinessDocumentNumber(businessDocumentOrder.getGoodsNumber());
                    executeOrderDO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
@@ -759,6 +759,9 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
    @ApiModelProperty(value = "出入库单号")
    private String entryNumber;

+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
    @ApiModelProperty("执行单")
    private List<ExecuteOrder> executeOrderList;

@@ -739,6 +739,9 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
    @ApiModelProperty("收款账户id")
    private String paymentAccountId;

+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
    @ApiModelProperty("收款账户信息")
    private String accountInformation;

@@ -103,6 +103,9 @@ public class ExecuteOrder extends BaseVOEntity{
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String dischargerName;

+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+


    @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
@@ -185,6 +185,10 @@ public class ExecuteOrderPO extends BaseVOEntity{
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String loadingLatitude;

+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date layDate;
+
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String loadingUnit;
@@ -112,6 +112,9 @@ public class ExecuteOrderDO extends BaseVOEntity{
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String loadingName;

+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
    @ApiModelProperty(name = "组织ID集合")
    private List<Long> organizationIdList;

@@ -765,6 +765,9 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
    @ApiModelProperty(value = "出入库单号")
    private String entryNumber;

+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
+
    @ApiModelProperty("业务单地址集合")
    private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;

@@ -128,4 +128,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{

    @ApiModelProperty("备注")
    private String  shippingNote;
+
+    @ApiModelProperty("预计出发日期")
+    private Date layDate;
 }