Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.handlers;
 import com.lframework.starter.bpm.dto.FlowInstanceExtDto;
 import com.lframework.starter.bpm.enums.FlowInstanceStatus;
 import com.lframework.starter.bpm.service.BusinessDataHandlerService;
+import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
@@ -30,6 +31,7 @@ import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
+import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -484,17 +486,25 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         ticketVo.setWorkshopId(draftRequestCarTicket.getWorkshopId());
         ticketVo.setOrderNo(draftRequestCarTicket.getOrderNo());
         ticketVo.setOrderingUnit(draftRequestCarTicket.getOrderingUnit());
-        if (orderInfo.getTotalQuantity() != null) {
-            BigDecimal result = orderInfo.getTotalQuantity().divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
-            ticketVo.setQuantity(result);
-        }
+        ticketVo.setQuantity(draftRequestCarTicket.getQuantity());
         //外办审核人(草稿要车单审核人)
         ticketVo.setExternalAuditor(SecurityUtil.getCurrentUser().getId());
         //经营办审核人(发货计划提交人)
         ticketVo.setBusinessOfficeAuditor(draftRequestCarTicket.getBusinessOfficeAuditor());
+        Object o = redisHandler.get("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
+        if (o != null) {
+            ticketVo.setPurchaseOrderId(String.valueOf(o));
+            redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
+        }
         return ticketVo;
     }
 
+    /**
+     * 延期发货
+     *
+     * @param flowStatus
+     * @param businessId
+     */
     private void handleDelayedShipmentData(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
@@ -502,6 +512,33 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             QueryDelayedShipmentDetailVo vo = new QueryDelayedShipmentDetailVo();
             vo.setDelayedShipmentId(businessId);
             List<DelayedShipmentDetail> query = delayedShipmentDetailService.query(vo);
+            Object shipmentsOrderId = redisHandler.get("GET_SHIPMENTS_ORDER_ID_" + businessId);
+            if (shipmentsOrderId != null) {
+                QueryRequestCarTicketVo vo2 = new QueryRequestCarTicketVo();
+                vo2.setShipmentsOrderId(String.valueOf(shipmentsOrderId));
+                List<RequestCarTicket> query1 = requestCarTicketService.query(vo2);
+                if (CollectionUtil.isEmpty(query1)) {
+                    String requestCarTicketId = query1.get(0).getId();
+                    //计划吨位
+                    BigDecimal quantity = query1.get(0).getQuantity();
+                    if (CollectionUtil.isNotEmpty(query)) {
+                        //扣减要车单计划吨位(目前只有单条)
+                        DelayedShipmentDetail delayedShipmentDetail1 = query.get(0);
+                        //发货数量
+                        BigDecimal quantity1 = delayedShipmentDetail1.getQuantity();
+                        BigDecimal difference = quantity.subtract(quantity1);
+                        if (difference.compareTo(BigDecimal.ZERO) == 0) {
+                            //删除要车单
+                            requestCarTicketService.deleteById(requestCarTicketId);
+                            redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + businessId);
+                        } else {
+                            //更新计划吨位
+                            requestCarTicketService.updateQuantity(requestCarTicketId, difference);
+                            redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + businessId);
+                        }
+                    }
+                }
+            }
             if (CollectionUtils.isNotEmpty(query)) {
                 for (DelayedShipmentDetail delayedShipmentDetail : query) {
                     //更新订货单物料行发货时间

@@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 
 @Service
@@ -226,6 +227,27 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         OpLogUtil.setExtra(ids);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "修改要车单计划吨位，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateQuantity(String id, BigDecimal quantity) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+        RequestCarTicket data = getBaseMapper().findById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("要车单不存在！");
+        }
+        LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
+                .set(RequestCarTicket::getQuantity, quantity)
+                .eq(RequestCarTicket::getId, id);
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除要车单表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -10,6 +10,7 @@ import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.mq.core.service.MqProducerService;
+import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;;
@@ -31,18 +32,23 @@ import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.DelayedShipment;
 import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.entity.RequestCarTicket;
 import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
+import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.delay.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -72,6 +78,11 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private RequestCarTicketService requestCarTicketService;
+    @Autowired
+    private RedisHandler redisHandler;
+
 
     @Override
     public PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo) {
@@ -203,6 +214,8 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         if (delayedExceedOneDay && !hasAny) {
             //开启审核
             vo.setWorkshopCode(delayedShipmentDetail.getWorkshopCode());
+            String key = "GET_SHIPMENTS_ORDER_ID_" + data.getId();
+            redisHandler.set(key, vo.getShipmentsOrderId());
 
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
         } else {
@@ -212,6 +225,30 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
             QueryDelayedShipmentDetailVo vo1 = new QueryDelayedShipmentDetailVo();
             vo1.setDelayedShipmentId(data.getId());
             List<DelayedShipmentDetail> query = delayedShipmentDetailService.query(vo1);
+            if (StringUtil.isNotEmpty(vo.getShipmentsOrderId())) {
+                QueryRequestCarTicketVo vo2 = new QueryRequestCarTicketVo();
+                vo2.setShipmentsOrderId(vo.getShipmentsOrderId());
+                List<RequestCarTicket> query1 = requestCarTicketService.query(vo2);
+                if (CollectionUtil.isNotEmpty(query1)) {
+                    String requestCarTicketId = query1.get(0).getId();
+                    //计划吨位
+                    BigDecimal quantity = query1.get(0).getQuantity();
+                    if (CollectionUtil.isNotEmpty(query)) {
+                        //扣减要车单计划吨位(目前只有单条)
+                        DelayedShipmentDetail delayedShipmentDetail1 = query.get(0);
+                        //发货数量
+                        BigDecimal quantity1 = delayedShipmentDetail1.getQuantity();
+                        BigDecimal difference = quantity.subtract(quantity1);
+                        if (difference.compareTo(BigDecimal.ZERO) == 0) {
+                            //删除要车单
+                            requestCarTicketService.deleteById(requestCarTicketId);
+                        } else {
+                            //更新计划吨位
+                            requestCarTicketService.updateQuantity(requestCarTicketId, difference);
+                        }
+                    }
+                }
+            }
             if (CollectionUtil.isNotEmpty(query)) {
                 for (DelayedShipmentDetail detail : query) {
                     purchaseOrderLineService.updateDeliveryDate(detail.getOrderSpecId(), detail.getApplyShipmentDate());

@@ -6,6 +6,8 @@ import com.lframework.xingyun.sc.entity.RequestCarTicket;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.UpdateRequestCarTicketVo;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -65,6 +67,14 @@ public interface RequestCarTicketService extends BaseMpService<RequestCarTicket>
     void updateExamineUserBatch(List<String> ids, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor);
 
     /**
+     * 修改计划吨位
+     *
+     * @param id       主键
+     * @param quantity 计划吨位
+     */
+    void updateQuantity(String id, BigDecimal quantity);
+
+    /**
      * 根据ID删除
      * @param id
      * @return

@@ -4,6 +4,8 @@ import lombok.Data;
 import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+
 import java.io.Serializable;
 
 @Data
@@ -60,4 +62,10 @@ public class QueryRequestCarTicketVo extends PageVo implements BaseVo, Serializa
     @ApiModelProperty("要车计划ID")
     private String planId;
 
+    /**
+     * 发货单ID
+     */
+    @ApiModelProperty("发货单ID")
+    private String shipmentsOrderId;
+
 }

@@ -23,6 +23,12 @@ public class CreateDelayedShipmentVo implements BaseVo, Serializable {
     private String deptId;
 
     /**
+     * 发货单ID
+     */
+    @ApiModelProperty("发货单ID")
+    private String shipmentsOrderId;
+
+    /**
      * 申请日期
      */
     @ApiModelProperty("申请日期")

@@ -30,6 +30,7 @@
         <result column="operations_department_auditor" property="operationsDepartmentAuditor"/>
         <result column="operations_department_auditor_name" property="operationsDepartmentAuditorName"/>
         <result column="status" property="status"/>
+        <result column="shipments_order_id" property="shipmentsOrderId"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -112,6 +113,9 @@
             <if test="vo.planId != null and vo.planId != ''">
                 AND tb.plan_id = #{vo.planId}
             </if>
+            <if test="vo.shipmentsOrderId != null and vo.shipmentsOrderId != ''">
+                AND tb.shipments_order_id = #{vo.shipmentsOrderId}
+            </if>
         </where>
         ORDER BY tb.create_time DESC
     </select>