修改业务单bug

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderAddDTO.java

@@ -499,4 +499,12 @@ TmsOrderAddDTO implements Serializable {
     @ApiModelProperty("发票编号")
     @Excel(name = "发票编号")
     private String invoiceNumber;
+
+    @ApiModelProperty("订单号")
+    @Excel(name = "订单号")
+    private String goodsNumber;
+
+    @ApiModelProperty("业务主单")
+    @Excel(name = "业务主单")
+    private String businessMainOrder;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java

@@ -550,6 +550,13 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                 //相加
                 tmsOrderAddDTO.setGoodsName("数量"+String.valueOf(bag + box));
             }
+            tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
+            String mainOrderNum = businessDocumentOrder.getMainOrderNum();
+            if (mainOrderNum != null) {
+                tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);
+            }else {
+                tmsOrderAddDTO.setBusinessMainOrder(businessDocumentOrder.getGoodsNumber());
+            }
             
             //货物信息
             List<BusinessDocumentCargoMulti> businessDocumentCargoMultiList=businessDocumentCargoMultiMapper.selectList(new QueryWrapper<BusinessDocumentCargoMulti>().lambda()

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java

@@ -211,6 +211,13 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setOrderSource("0");
                     tmsOrderAddDTO.setOrganizationId(organizationId);
                     tmsOrderAddDTO.setLoginUser(loginUser);
+                    tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
+                    String mainOrderNum = businessDocumentOrder.getMainOrderNum();
+                    if (mainOrderNum != null) {
+                        tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);
+                    }else {
+                        tmsOrderAddDTO.setBusinessMainOrder(businessDocumentOrder.getGoodsNumber());
+                    }
                     BusinessDeliveryDetailsLink businessDeliveryDetailsLink = businessDeliveryDetailsLinkMapper.selectOne(new LambdaQueryWrapper<BusinessDeliveryDetailsLink>().eq(BusinessDeliveryDetailsLink::getSubOrderId, businessDocumentOrder.getId()));
                     if (ObjectUtil.isNotNull(businessDeliveryDetailsLink)) {
                         Integer bag = businessDeliveryDetailsLink.getBag();

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java

@@ -221,4 +221,5 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @ApiModelProperty("卸货联系人")
     @Excel(name = "卸货联系人")
     private String dischargerName;
+
 }

mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml

@@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectExecuteOrderPo">
         SELECT
             eo.*,
-            bdo.main_order_num
+            bdo.main_order_num,
+            bdo.RECIPIENT_NAME
         FROM
             execute_order eo
                 LEFT JOIN