Merge branch 'dev' into dev_WMS20260401

# Conflicts:
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
#	mhd_oms/src/main/resources/bootstrap.yml
#	mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java

@@ -20,4 +20,6 @@ public interface ExecuteOrderMapper extends BaseMapper<ExecuteOrder>
     public List<ExecuteOrderPO> queryList(ExecuteOrderDO executeOrderDO);
 
     String getOrgNameByOrgId(@Param("organizationId") Long organizationId);
+
+    void updateTmsOrderImage(@Param("executeOrderNumber") String executeOrderNumber,@Param("pictureUrl") String pictureUrl);
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java

@@ -258,4 +258,13 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     @ApiModelProperty("是否抄码: 1-是 2-否")
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty(name = "收费标准")
+    private String chargeStandard;
+
+    @ApiModelProperty(name = "单位")
+    private String unit;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -18,6 +18,8 @@ import com.mhd.oms.domain.businessDeliveryDetailsLink.repository.facade.IBusines
 import com.mhd.oms.domain.businessDeliveryDetailsLink.repository.mapper.BusinessDeliveryDetailsLinkMapper;
 import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder;
 import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
+import com.mhd.oms.domain.executeOrder.entity.ExecuteOrder;
+import com.mhd.oms.domain.executeOrder.repository.mapper.ExecuteOrderMapper;
 import com.mhd.oms.domain.reservationDeliveryDetailsLink.entity.ReservationDeliveryDetailsLink;
 import com.mhd.oms.domain.reservationDeliveryDetailsLink.repository.facade.IReservationDeliveryDetailsLinkService;
 import com.mhd.oms.domain.reservationInMaterialDetail.entity.ReservationInMaterialDetail;
@@ -76,6 +78,9 @@ public class ReservationStockOutOrderDomainService {
     private ReservationStockInOrderMapper reservationStockInOrderMapper;
     @Autowired
     private BusinessDocumentOrderMapper businessDocumentOrderMapper;
+    @Autowired
+    private ExecuteOrderMapper executeOrderMapper;
+
     @Resource
     private SystemServiceFeign systemServiceFeign;
     @Resource
@@ -844,6 +849,15 @@ public class ReservationStockOutOrderDomainService {
                     BusinessDocumentOrder businessDocumentOrder = businessDocumentOrderMapper.selectOne(new LambdaQueryWrapper<BusinessDocumentOrder>().eq(BusinessDocumentOrder::getId, subOrderId));
                     businessDocumentOrder.setOrderStatus(3L);
                     businessDocumentOrderMapper.updateById(businessDocumentOrder);
+                    String executeOrderNumber = businessDocumentOrder.getExecuteOrderNumber();
+                    if (executeOrderNumber != null){
+                        ExecuteOrder executeOrder = executeOrderMapper.selectOne(new LambdaQueryWrapper<ExecuteOrder>().eq(ExecuteOrder::getGoodsNumber, executeOrderNumber));
+                        executeOrder.setInvoiceStatus(1);
+                        executeOrder.setInvoiceDate(new Date());
+                        executeOrderMapper.updateById(executeOrder);
+//                        pictureUrl="123";
+                        executeOrderMapper.updateTmsOrderImage(executeOrderNumber,pictureUrl);
+                    }
                 }
             }
         }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java

@@ -156,7 +156,10 @@ public class ExecuteOrderDTO extends BaseVOEntity{
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date invoiceEndTime;
 
+    @ApiModelProperty("发票编号")
+    private String invoiceNumber;
+
     @ApiModelProperty("车次")
     private Integer trainNo;
 
-}
+}