销售订单

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -933,6 +933,13 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     Long getCustomerCountByPage(Map param);
 
     /**
+     * @desc   : 获取单据Id
+     * @author : 付斌
+     * @date   : 2024-03-01 10:13
+     */
+    Object getUuidSeq();
+
+    /**
      * @desc   : 获取单据单号
      * @author : 常皓宁
      * @date   : 2024/2/28 9:35

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -2875,6 +2875,11 @@
         </if>
     </select>
 
+    <!--    获取单据Id-->
+    <select id="getUuidSeq" resultType="object">
+        select sys.f_uuid_seq()
+    </select>
+
     <!--    获取单据单号-->
     <select id="getDocNo" resultType="java.lang.String">
         select dkic_b.f_create_note(#{cpId}, #{purId}::uuid, #{docCode})

src/main/java/com/dk/mdm/model/pojo/sale/Order.java

@@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.List;
 import java.time.LocalDateTime;
 
 /**

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -2,11 +2,13 @@ package com.dk.mdm.service.sale;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.sale.OrderConvert;
 import com.dk.mdm.infrastructure.convert.sale.OrderItemConvert;
+import com.dk.mdm.mapper.common.CommonMapper;
 import com.dk.mdm.mapper.sale.OrderItemMapper;
 import com.dk.mdm.mapper.sale.OrderMapper;
 import com.dk.mdm.model.pojo.sale.Order;
@@ -59,6 +61,9 @@ public class OrderService extends BaseService<Order> {
     @Autowired
     private OrderItemMapper orderItemMapper;
 
+    @Autowired
+    private CommonMapper commonMapper;
+
     /**
      * @desc : 条件查询
      * @author : 付斌
@@ -100,15 +105,23 @@ public class OrderService extends BaseService<Order> {
         // 转化实体
         Order order = orderConvert.convertToPo(orderVO);
         order.setOrderNo(UUID.randomUUID().toString());
-        order.setOrderType("销售订单");
+        order.setOrderType(Constant.DocumentType.ORDER_CHASE.getName());
         order.setSalesChannel("10112024-0228-0000-0000-00000173ec3a");
+        // 订单总单保存
         super.insert(order);
 
-        //订单明细保存
+        // 更新单号
+        Order updateOrder = new Order();
+        updateOrder.setOrderNo(commonMapper.getDocNo(order.getCpId(), order.getOrderId(), Constant.DocumentType.ORDER_CHASE.getName()));
+        updateOrder.setOrderId(order.getOrderId());
+        super.update(updateOrder,new UpdateWrapper<Order>().lambda().eq(Order::getOrderId,
+                UUID.fromString(updateOrder.getOrderId())));
+
+        // 订单明细保存
         if (orderVO.getOrderItemList() != null && orderVO.getOrderItemList().size() > 0) {
             for (OrderItemVO orderItemVO : orderVO.getOrderItemList()) {
                 OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
-                orderItem.setOrderId(order.getOrderId());
+                orderItem.setOrderId(order.getOrderId()).setCpId(order.getCpId()).setOutStatus(Constant.OutStatus.DAICHUKU.getName());
                 orderItemMapper.insert(orderItem);
             }
         }