From 8cfd6d435a293eb55ec76de15506e3c90ca00386 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Wed, 4 Feb 2026 10:41:35 +0800 Subject: [PATCH] =?UTF-8?q?pda=E4=BA=A4=E6=8E=A5=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=8D=95=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandoverTaskOrderApplicationService.java | 26 +++++++++++++++++++ .../entity/HandoverTaskOrder.java | 3 +++ .../repository/po/HandoverTaskOrderPO.java | 3 ++- .../repository/todo/HandoverTaskOrderDO.java | 3 +++ .../stockOutOrder/entity/StockOutOrder.java | 3 +++ .../repository/po/StockOutOrderPO.java | 3 +++ .../HandoverTaskOrderDTO.java | 3 +++ .../HandoverTaskOrderApi.java | 8 +++++- .../HandoverTaskOrderMapper.xml | 3 ++- .../stockOutOrder/StockOutOrderMapper.xml | 3 ++- 10 files changed, 54 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java index c58528c1a..54a2d380f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java @@ -2,6 +2,9 @@ package com.mhd.wms.application.service.handoverTaskOrder; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.utils.DateUtils; @@ -14,11 +17,16 @@ import com.mhd.system.api.domain.PlatformUseTimeFeignPO; import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO; import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder; +import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService; import com.mhd.wms.domain.handoverTaskOrder.repository.po.HandoverTaskOrderPO; import com.mhd.wms.domain.handoverTaskOrder.repository.todo.HandoverTaskOrderDO; import com.mhd.wms.domain.handoverTaskOrder.service.HandoverTaskOrderDomainService; import com.mhd.wms.domain.shiftManage.repository.todo.ShiftManageDO; +import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; +import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +50,12 @@ public class HandoverTaskOrderApplicationService { @Autowired private UserServiceFeign userServiceFeign; + @Autowired + private IHandoverTaskOrderService handoverTaskOrderService; + + @Autowired + private IStockOutOrderService stockOutOrderService; + /** * 分页查询交接作业单列表 @@ -173,4 +187,16 @@ public class HandoverTaskOrderApplicationService { UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class); handoverTaskOrderDO.setOperatorsName(userPo.getUserName()); } + + public void pictureApp(HandoverTaskOrderDO handoverTaskOrderDO) { + //pda上传图片插入交接作业单 + handoverTaskOrderService.update(new LambdaUpdateWrapper() + .eq(HandoverTaskOrder::getOrderNumber,handoverTaskOrderDO.getOrderNumber()) + .set(HandoverTaskOrder::getPictureApp,handoverTaskOrderDO.getPictureApp())); + //pda上传图片插入出库管理 + stockOutOrderService.update(new LambdaUpdateWrapper() + .eq(StockOutOrder::getOutOrderNumber,handoverTaskOrderDO.getOrderNumber()) + .set(StockOutOrder::getPictureApp,handoverTaskOrderDO.getPictureApp()) + ); + } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java index 383e61b5e..f9e2b4e5b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java @@ -134,4 +134,7 @@ public class HandoverTaskOrder extends BaseVOEntity { @Excel(name = "任务下发时间", width = 30, dateFormat = "yyyy-MM-dd") private Date taskDistributionTime; + @ApiModelProperty("app上传的图片") + private String pictureApp; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java index e8e86272c..d374c2b34 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java @@ -124,6 +124,7 @@ public class HandoverTaskOrderPO extends BaseVOEntity { @Excel(name = "备注") private String remark; - + @ApiModelProperty("app上传的图片") + private String pictureApp; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java index 8891a3fb5..04f91dd83 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java @@ -139,4 +139,7 @@ public class HandoverTaskOrderDO extends BaseVOEntity { @ApiModelProperty("作业人姓名") @Excel(name = "作业人姓名") private String operatorsName; + + @ApiModelProperty("app上传的图片") + private String pictureApp; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java index 56b52f98d..218bf2031 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java @@ -366,4 +366,7 @@ public class StockOutOrder extends BaseVOEntity { @ApiModelProperty("是否需要运输") @Excel(name = "是否需要运输") private String needTransportFlag; + @ApiModelProperty("app上传的图片") + private String pictureApp; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index b2789ea2a..61c9ab403 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -374,4 +374,7 @@ public class StockOutOrderPO extends BaseVOEntity { @Excel(name = "是否需要运输") private String needTransportFlag; + @ApiModelProperty("app上传的图片") + private String pictureApp; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java index 69e0fa29a..0a9f4c95b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java @@ -139,4 +139,7 @@ public class HandoverTaskOrderDTO extends BaseVOEntity { @ApiModelProperty("作业人姓名") @Excel(name = "作业人姓名") private String operatorsName; + + @ApiModelProperty("app上传的图片") + private String pictureApp; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java index 0687feb3d..50249664e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java @@ -115,7 +115,13 @@ public class HandoverTaskOrderApi extends BaseController { return toAjax(handoverTaskOrderApplicationService.completeHandover(handoverTaskOrderDO)); } - + @ApiOperation("交接作业单APP上传图片") + @PostMapping("/pictureApp") + public AjaxResult pictureApp(@RequestBody HandoverTaskOrderDTO handoverTaskOrderDTO) { + HandoverTaskOrderDO handoverTaskOrderDO = handoverTaskOrderAssembler.toDO(handoverTaskOrderDTO); + handoverTaskOrderApplicationService.pictureApp(handoverTaskOrderDO); + return AjaxResult.success(); + } diff --git a/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml b/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml index fb1141cb0..b6e60a45e 100644 --- a/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml @@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.platform_code, a.platform_name, a.platform_use_time_id, a.platform_use_start_time, a.platform_use_end_time, a.platform_use_status, a.order_type_code, a.order_type_name, a.expect_time, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_name, a.order_number, a.picking_order_number, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, - a.update_by, a.update_by_name, a.del_flag + a.update_by, a.update_by_name, a.del_flag, a.picture_app diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 13f1c1c1b..4002fbaa8 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -96,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.CONTACT_PERSON,a.VEHICLE_MODEL_PLATE,a.ENTRUST_NO,a.TEL,a.DRIVER_SIGN,a.FAX,a.DECLARE_CUSTOMS,a.MANUFACTURER, a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE, a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME, - a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG + a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app