pda交接作业单图片上传
This commit is contained in:
+26
@@ -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<HandoverTaskOrder>()
|
||||
.eq(HandoverTaskOrder::getOrderNumber,handoverTaskOrderDO.getOrderNumber())
|
||||
.set(HandoverTaskOrder::getPictureApp,handoverTaskOrderDO.getPictureApp()));
|
||||
//pda上传图片插入出库管理
|
||||
stockOutOrderService.update(new LambdaUpdateWrapper<StockOutOrder>()
|
||||
.eq(StockOutOrder::getOutOrderNumber,handoverTaskOrderDO.getOrderNumber())
|
||||
.set(StockOutOrder::getPictureApp,handoverTaskOrderDO.getPictureApp())
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
+3
@@ -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;
|
||||
|
||||
}
|
||||
|
||||
+2
-1
@@ -124,6 +124,7 @@ public class HandoverTaskOrderPO extends BaseVOEntity {
|
||||
@Excel(name = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
@ApiModelProperty("app上传的图片")
|
||||
private String pictureApp;
|
||||
|
||||
}
|
||||
|
||||
+3
@@ -139,4 +139,7 @@ public class HandoverTaskOrderDO extends BaseVOEntity {
|
||||
@ApiModelProperty("作业人姓名")
|
||||
@Excel(name = "作业人姓名")
|
||||
private String operatorsName;
|
||||
|
||||
@ApiModelProperty("app上传的图片")
|
||||
private String pictureApp;
|
||||
}
|
||||
|
||||
@@ -366,4 +366,7 @@ public class StockOutOrder extends BaseVOEntity {
|
||||
@ApiModelProperty("是否需要运输")
|
||||
@Excel(name = "是否需要运输")
|
||||
private String needTransportFlag;
|
||||
@ApiModelProperty("app上传的图片")
|
||||
private String pictureApp;
|
||||
|
||||
}
|
||||
+3
@@ -374,4 +374,7 @@ public class StockOutOrderPO extends BaseVOEntity {
|
||||
@Excel(name = "是否需要运输")
|
||||
private String needTransportFlag;
|
||||
|
||||
@ApiModelProperty("app上传的图片")
|
||||
private String pictureApp;
|
||||
|
||||
}
|
||||
+3
@@ -139,4 +139,7 @@ public class HandoverTaskOrderDTO extends BaseVOEntity {
|
||||
@ApiModelProperty("作业人姓名")
|
||||
@Excel(name = "作业人姓名")
|
||||
private String operatorsName;
|
||||
|
||||
@ApiModelProperty("app上传的图片")
|
||||
private String pictureApp;
|
||||
}
|
||||
|
||||
+7
-1
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateByName" column="update_by_name" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="pictureApp" column="picture_app" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -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
|
||||
</sql>
|
||||
|
||||
<sql id="selectHandoverTaskOrderPo1">
|
||||
|
||||
@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="customsInspectionFlag" column="customs_inspection_flag"/>
|
||||
<result property="needDeclareFlag" column="need_declare_flag"/>
|
||||
<result property="needTransportFlag" column="need_transport_flag"/>
|
||||
<result property="pictureApp" column="picture_app"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -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
|
||||
</sql>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user