From 494c2e3361386a8f596d3efa254247c64e72b603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Fri, 12 Jun 2026 17:50:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E4=BF=AE=E6=94=B9=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=8D=95=E4=B8=8A=E4=BC=A0=E5=8F=91=E7=A5=A8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=B8=8E=E7=8A=B6=E6=80=81=EF=BC=8C=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E9=80=80=E8=B4=A7=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E6=89=A7=E8=A1=8C=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/mapper/ExecuteOrderMapper.java | 2 ++ .../ReservationStockOutOrderDomainService.java | 14 ++++++++++++++ .../dto/executeOrder/ExecuteOrderDTO.java | 3 +++ .../mapper/executeOrder/ExecuteOrderMapper.xml | 16 +++++++++++++++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java index c86b88558..e452637b6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java @@ -20,4 +20,6 @@ public interface ExecuteOrderMapper extends BaseMapper public List queryList(ExecuteOrderDO executeOrderDO); String getOrgNameByOrgId(@Param("organizationId") Long organizationId); + + void updateTmsOrderImage(@Param("executeOrderNumber") String executeOrderNumber,@Param("pictureUrl") String pictureUrl); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index c4fe134fa..c3dbb8e2f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/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().eq(BusinessDocumentOrder::getId, subOrderId)); businessDocumentOrder.setOrderStatus(3L); businessDocumentOrderMapper.updateById(businessDocumentOrder); + String executeOrderNumber = businessDocumentOrder.getExecuteOrderNumber(); + if (executeOrderNumber != null){ + ExecuteOrder executeOrder = executeOrderMapper.selectOne(new LambdaQueryWrapper().eq(ExecuteOrder::getGoodsNumber, executeOrderNumber)); + executeOrder.setInvoiceStatus(1); + executeOrder.setInvoiceDate(new Date()); + executeOrderMapper.updateById(executeOrder); +// pictureUrl="123"; + executeOrderMapper.updateTmsOrderImage(executeOrderNumber,pictureUrl); + } } } } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java index f3d86b6a6..c72039fa0 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java +++ b/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; + } diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml index 44603eeb8..9273788aa 100644 --- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml +++ b/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} - and eo.INVOICE_Status = #{invoiceStatus} + and eo.INVOICE_STATUS = #{invoiceStatus} + + + and eo.INVOICE_NUMBER like concat('%', #{invoiceNumber}, '%') and eo.CREATE_TIME <= #{createEndTime} + 1 - 1/86400 @@ -104,6 +107,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + 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} + ) +