退货修改执行单上传发票时间与状态，业务单退货图片添加，执行单查询发票编号

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/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,4 +156,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date invoiceEndTime;
 
+    @ApiModelProperty("发票编号")
+    private String invoiceNumber;
+
 }

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

@@ -43,7 +43,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and eo.CREATE_TIME >= #{createStartTime}
             </if>
             <if test="invoiceStatus != null">
-                and eo.INVOICE_Status = #{invoiceStatus}
+                and eo.INVOICE_STATUS = #{invoiceStatus}
+            </if>
+            <if test="invoiceNumber != null and invoiceNumber != ''">
+                and eo.INVOICE_NUMBER like concat('%', #{invoiceNumber}, '%')
             </if>
             <if test="createEndTime != null">
                 and eo.CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400
@@ -104,6 +107,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         </where>
     </sql>
+    <update id="updateTmsOrderImage">
+        UPDATE NGWL_TEST_WLHY.TMS_TRANSPORT_NOTE
+        SET UNLOAD_IMAGE = #{pictureUrl},
+            UNLOAD_TIME = NOW(),
+            RECEIPT_TIME = NOW()
+        WHERE TRANSPORTATION_NUMBER IN (
+            SELECT GOODS_NUMBER
+            FROM NGWL_TEST_WLHY.TMS_ORDER
+            WHERE EXECUTE_ORDER_NUMBER = #{executeOrderNumber}
+        )
+    </update>
 
     <select id="queryList" parameterType="com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO" resultMap="ExecuteOrderResult">
         <include refid="selectExecuteOrderPo"/>