Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -1398,6 +1398,34 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<PageList<Map<String, Object>>> GetCustomerByPage(@RequestBody Map<String, Object> param) {
         return commonService.GetCustomerByPage(param);
     }
+
+    /**
+     * @desc   : 获取供应商
+     * @author : 常皓宁
+     * @date   : 2024/3/1 9:19
+     */
+    @ApiOperation(
+            value = "获取供应商",
+            notes = "获取供应商"
+    )
+    @PostMapping("get_supplier")
+    public ResponseResultVO<List<Map<String, Object>>> getSupplier(@RequestBody Map<String, Object> param) {
+        return commonService.getSupplier(param);
+    }
+
+    /**
+     * @desc   : 获取供应商分页
+     * @author : 常皓宁
+     * @date   : 2024/3/1 9:19
+     */
+    @ApiOperation(
+            value = "获取供应商（分页）",
+            notes = "获取供应商（分页）"
+    )
+    @PostMapping("get_supplier_by_page")
+    public ResponseResultVO<PageList<Map<String, Object>>> getSupplierByPage(@RequestBody Map<String, Object> param) {
+        return commonService.getSupplierByPage(param);
+    }
 }
 
 

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

@@ -933,9 +933,30 @@ 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
      */
     String getDocNo(@Param("cpId") Integer cpId, @Param("purId") String purId, @Param("docCode") String docCode);
+
+    /**
+     * @desc   : 获取供应商
+     * @author : 常皓宁
+     * @date   : 2024/3/1 9:21
+     */
+    List<Map<String, Object>> getSupplier(Map param);
+
+    /**
+     * @desc   : 获取供应商数量
+     * @author : 常皓宁
+     * @date   : 2024/3/1 9:21
+     */
+    Long countSupplier(Map<String, Object> param);
 }

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

@@ -2875,8 +2875,50 @@
         </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})
     </select>
+
+    <!--获取供应商-->
+    <select id="getSupplier" resultType="java.util.Map">
+        select tms.sup_code       as "supplierCode",
+        tms.sup_name              as "supplierName",
+        tms.sup_id                as "supplierId",
+        tms.sup_type              as "supplierType",
+        tms.flg_valid             as "flgValid"
+        from dkic_b.t_mst_supplier tms
+        where tms.cp_id = #{cpId}
+        <if test="supplierName!=null and supplierName!=''" >
+            AND tms.sup_name LIKE concat('%', #{supplierName}, '%')
+        </if>
+        <if test="supplierCode!=null and supplierCode!=''" >
+            AND tms.sup_code LIKE concat('%', #{supplierCode}, '%')
+        </if>
+        order by tms.sup_code
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+        <if test="limit != null and limit != 0 ">
+            limit #{limit}
+        </if>
+    </select>
+
+    <!--获取供应商数量-->
+    <select id="countSupplier" resultType="java.lang.Long">
+        select count(1)
+        from dkic_b.t_mst_supplier tms
+        where tms.cp_id = #{cpId}
+        <if test="supplierName!=null and supplierName!=''" >
+            AND tms.sup_name LIKE concat('%', #{supplierName}, '%')
+        </if>
+        <if test="supplierCode!=null and supplierCode!=''" >
+            AND tms.sup_code LIKE concat('%', #{supplierCode}, '%')
+        </if>
+    </select>
 </mapper>

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/common/CommonService.java

@@ -1332,4 +1332,38 @@ public class CommonService extends BaseService<Map<String, Object>> {
         return super.mergeListWithCount(param, commonMapper.getCustomer(param),
                 commonMapper.getCustomerCountByPage(param));
     }
+
+    /**
+     * @desc   : 获取供应商
+     * @author : 常皓宁
+     * @date   : 2024/3/1 9:20
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getSupplier(Map<String, Object> param) {
+        // 获取公司
+        List<Map<String, Object>> list = commonMapper.getSupplier(param);
+        return ResponseResultUtil.success(list);
+    }
+
+    /**
+     * @desc   : 获取供应商（分页）
+     * @author : 常皓宁
+     * @date   : 2024/3/1 9:20
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getSupplierByPage(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+        // 分页参数赋值
+        param = this.getLimit(param);
+        // 定义返回值
+        PageList data = new PageList<>();
+        // 获取公司
+        List<Map<String, Object>> list = commonMapper.getSupplier(param);
+        // 获取总数量
+        Long total = commonMapper.countSupplier(param);
+        // 组装返回值
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage")).setList(list).setTotal(total);
+        return ResponseResultUtil.success(data);
+    }
 }

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -93,8 +93,7 @@ public class StaffService extends BaseService<Staff> {
     public ResponseResultVO<Boolean> update(StaffVO staffVO) {
         // 转化实体
         Staff staff = staffConvert.convertToPo(staffVO);
-        return ResponseResultUtil.success(super.update(staff, new UpdateWrapper<Staff>().lambda().eq(Staff::getStaffId,
-                UUID.fromString(staff.getStaffId()))));
+        return super.updateByUuid(staff);
     }
 
     /**

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);
             }
         }