Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/controller/mst/StaffRightController.java

@@ -4,6 +4,7 @@ import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.mst.StaffRight;
 import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.vo.mst.StaffRightVO;
 import com.dk.mdm.model.vo.mst.StaffVO;
 import com.dk.mdm.service.mst.StaffService;
 import io.swagger.annotations.ApiOperation;
@@ -62,4 +63,19 @@ public class StaffRightController{
         return staffService.saveStaffRight(staffVO);
     }
 
+    /**
+     * @desc   : WEB获取员工权限
+     * @author : 常皓宁
+     * @date   : 2024/3/6 13:15
+     */
+    @ApiOperation(
+            value = "WEB获取员工权限",
+            notes = "WEB获取员工权限"
+    )
+    @PostMapping("get_staff_right_web")
+    public ResponseResultVO<Map<String, Object>> getStaffRightWeb(@RequestBody Map<String, Object> param) {
+        return staffRightService.getStaffRightWeb(param);
+    }
+
+
 }

src/main/java/com/dk/mdm/controller/sale/OrderController.java

@@ -75,7 +75,7 @@ public class OrderController {
      * @author : 付斌
      * @date   : 2024-03-03 9:28
      */
-    @ApiOperation(value = "编辑订单", notes = "编辑订单")
+    @ApiOperation(value = "获取订单信息（编辑用）", notes = "获取订单信息（编辑用）")
     @PostMapping({"get_order_for_update/{id}"})
     public ResponseResultVO<?> getOrderForUpdate(@PathVariable String id) {
         return orderService.getOrderForUpdate(id);
@@ -91,4 +91,15 @@ public class OrderController {
     public ResponseResultVO<Boolean> update(@RequestBody OrderVO orderVO) {
         return orderService.update(orderVO);
     }
+
+    /**
+     * @desc   : 获取订单信息（出库用）
+     * @author : 付斌
+     * @date   : 2024-03-06 12:58
+     */
+    @ApiOperation(value = "获取订单信息（出库用）", notes = "获取订单信息（出库用）")
+    @PostMapping({"get_order_for_out/{id}"})
+    public ResponseResultVO<?> getOrderForOut(@PathVariable String id) {
+        return orderService.getOrderForOut(id);
+    }
 }

src/main/java/com/dk/mdm/infrastructure/convert/mst/StaffRightConvert.java

@@ -1,13 +0,0 @@
-package com.dk.mdm.infrastructure.convert.mst;
-
-import org.mapstruct.Mapper;
-
-/**
- * @desc   : StaffRightConvert
- * @author : admin
- * @date   : 2023/2/3 15:44
- */
-@Mapper(componentModel = "spring")
-public class StaffRightConvert {
-
-}

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, into_id, into_type, from_id, from_item_id, item_index, sku_id, item_qty, price_into, item_amt, non_std_code, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, remarks, inv_id, cost_price, cost_amt, out_qty, inv_qty, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, into_id, into_type, from_id, from_item_id, item_index, sku_id, price_into, non_std_code, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, remarks, inv_id, cost_price, cost_amt, out_qty, inv_qty, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -17,9 +17,7 @@
                 <result column="from_item_id" property="fromItemId" typeHandler="UuidTypeHandler"/>
                 <result column="item_index" property="itemIndex"/>
                 <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
-                <result column="item_qty" property="itemQty"/>
                 <result column="price_into" property="priceInto"/>
-                <result column="item_amt" property="itemAmt"/>
                 <result column="non_std_code" property="nonStdCode"/>
                 <result column="into_status" property="intoStatus"/>
                 <result column="intoing_qty" property="intoingQty"/>
@@ -66,15 +64,9 @@
             <if test="skuId != null and skuId != ''">
                 AND sku_id = #{skuId}
             </if>
-            <if test="itemQty != null">
-                AND item_qty = #{itemQty}
-            </if>
             <if test="priceInto != null">
                 AND price_into = #{priceInto}
             </if>
-            <if test="itemAmt != null">
-                AND item_amt = #{itemAmt}
-            </if>
             <if test="nonStdCode != null and nonStdCode != ''">
                 AND non_std_code = #{nonStdCode}
             </if>
@@ -210,9 +202,7 @@
             from_item_id,
             item_index,
             sku_id,
-            item_qty,
             price_into,
-            item_amt,
             non_std_code,
             into_status,
             intoing_qty,
@@ -241,9 +231,7 @@
                 #{item.fromItemId}::uuid,
                 #{item.itemIndex},
                 #{item.skuId}::uuid,
-                #{item.itemQty},
                 #{item.priceInto},
-                #{item.itemAmt},
                 #{item.nonStdCode},
                 #{item.intoStatus},
                 #{item.intoingQty},

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, out_id, out_type, from_id, from_item_id, item_index, sku_id, item_qty, price_out, item_amt, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, inv_id, cost_price, cost_amt, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, out_id, out_type, from_id, from_item_id, item_index, sku_id, price_out, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, inv_id, cost_price, cost_amt, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -17,9 +17,7 @@
                 <result column="from_item_id" property="fromItemId" typeHandler="UuidTypeHandler"/>
                 <result column="item_index" property="itemIndex"/>
                 <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
-                <result column="item_qty" property="itemQty"/>
                 <result column="price_out" property="priceOut"/>
-                <result column="item_amt" property="itemAmt"/>
                 <result column="non_std_code" property="nonStdCode"/>
                 <result column="out_status" property="outStatus"/>
                 <result column="outing_qty" property="outingQty"/>
@@ -64,15 +62,9 @@
             <if test="skuId != null and skuId != ''">
                 AND sku_id = #{skuId}
             </if>
-            <if test="itemQty != null">
-                AND item_qty = #{itemQty}
-            </if>
             <if test="priceOut != null">
                 AND price_out = #{priceOut}
             </if>
-            <if test="itemAmt != null">
-                AND item_amt = #{itemAmt}
-            </if>
             <if test="nonStdCode != null and nonStdCode != ''">
                 AND non_std_code = #{nonStdCode}
             </if>
@@ -202,9 +194,7 @@
             from_item_id,
             item_index,
             sku_id,
-            item_qty,
             price_out,
-            item_amt,
             non_std_code,
             out_status,
             outing_qty,
@@ -231,9 +221,7 @@
                 #{item.fromItemId}::uuid,
                 #{item.itemIndex},
                 #{item.skuId}::uuid,
-                #{item.itemQty},
                 #{item.priceOut},
-                #{item.itemAmt},
                 #{item.nonStdCode},
                 #{item.outStatus},
                 #{item.outingQty},

src/main/java/com/dk/mdm/mapper/mst/StaffRightMapper.java

@@ -18,5 +18,12 @@ public interface StaffRightMapper extends BaseMapper<StaffRight>{
      * @date : 2024/2/26 10:36
      */
     List<Map<String, Object>> getStaffRight(Map param);
+
+    /**
+     * @desc   : WEB获取员工权限
+     * @author : 常皓宁
+     * @date   : 2024/3/6 13:16
+     */
+    List<Map<String, Object>> getStaffRightWeb(Map param);
 }
 

src/main/java/com/dk/mdm/mapper/mst/StaffRightMapper.xml

@@ -163,4 +163,26 @@
           AND menu.object_code != 'home'
         ORDER BY menu.level_code;
     </select>
+
+    <!-- WEB获取功能权限 -->
+    <select id="getStaffRightWeb" resultType="java.util.Map">
+        SELECT menu.menu_uuid    AS "menuUuid",
+               menu.menu_uuid    AS "id",
+               menu.menu_name    AS "menuName",
+               menu.app_code     AS "appCode",
+               menu.parent_uuid  AS "parentId",
+               menu.flg_menu     AS "flgMenu",
+               staffRight.staff_id   AS "staffId",
+               menu.fun_uuid     AS "funUuid",
+               CASE WHEN staffRight.staff_id IS NULL THEN FALSE ELSE TRUE END    AS "checked"
+        FROM sys.t_app_menu menu
+                 left JOIN dkic_b.t_mst_role_fun roleFun ON menu.fun_uuid = roleFun.fun_uuid  and roleFun.role_id::uuid =  any ( (
+                 select  role_ids from dkic_b.t_mst_staff where staff_id = #{staffId}::uuid)::uuid[])
+            left JOIN   dkic_b.t_mst_staff_right staffRight ON menu.fun_uuid = staffRight.fun_uuid  and staffRight.staff_id = #{staffId}::uuid
+
+        WHERE menu.flg_valid
+          AND menu.flg_right
+          AND menu.object_code != 'home'
+        ORDER BY menu.level_code;
+    </select>
 </mapper>

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.java

@@ -34,5 +34,12 @@ public interface OrderItemMapper extends BaseMapper<OrderItem>{
      * @date   : 2024-03-03 14:17
      */
     int deleteById(@Param("id") String id);
+
+    /**
+     * @desc   : 根据条件进行查询（出库用）
+     * @author : 付斌
+     * @date   : 2024-03-06 12:59
+     */
+    List<OrderItemResponse> selectByCondForOut(OrderItemQuery orderQuery);
 }
 

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -5,7 +5,8 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id , order_id, item_index, sku_id, item_qty, price_std, amt_std, price_sale, item_amt, price_discount, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id
+        , order_id, item_index, sku_id, item_qty, price_std, amt_std, price_sale, item_amt, price_discount, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -237,7 +238,39 @@
     </insert>
 
     <delete id="deleteById">
-        DELETE FROM dkic_b.t_psi_order_item
+        DELETE
+        FROM dkic_b.t_psi_order_item
         WHERE item_id = #{id}::UUID;
     </delete>
+
+    <!-- 根据条件进行查询（出库用） -->
+    <select id="selectByCondForOut" resultMap="BaseResultMap">
+        SELECT tpoi.item_id,
+               tpoi.order_id,
+               tpoi.item_index,
+               tpoi.sku_id,
+               tmgs.sku_code                                      as "skuCode",
+               tmgs.sku_model                                     as "skuModel",
+               tmgs.sku_name                                      as "skuName",
+               tpoi.item_qty                                      as "orderQty",
+               tpoi.item_qty - tpoi.outing_qty                    as "canOutingQty",
+               tpoi.item_qty - tpoi.outing_qty                    as outing_qty,
+               tpoi.price_std * (tpoi.item_qty - tpoi.outing_qty) as item_amt,
+               tpoi.price_sale as "price_out",
+               tpoi.non_std_code,
+               tpoi.remarks,
+               tpi.inv_id                                         as "invId",
+               tpi.wh_id                                          as "whId",
+               tpi.inv_qty                                        as "invQty",
+               tpi.usable_qty                                     as "usableQty",
+               tmw.wh_name                                        as "whName"
+        FROM dkic_b.t_psi_order_item as tpoi
+                 inner join dkic_b.t_mst_goods_sku tmgs on tpoi.sku_id = tmgs.sku_id
+                 left join dkic_b.t_psi_inventory as tpi
+                           on tpi.sku_id = tpoi.sku_id and tpi.non_std_code = tpoi.non_std_code and
+                              tpi.cp_id = tpoi.cp_id
+                 left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
+        where tpoi.order_id = #{orderId}::uuid
+        order by tpoi.item_index
+    </select>
 </mapper>

src/main/java/com/dk/mdm/model/pojo/ivt/InboundItem.java

@@ -99,14 +99,6 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
 
 
     /**
-     * 商品数量
-     */
-    @Excel(name = "商品数量")
-    @ApiModelProperty(value = "商品数量")
-    private BigDecimal itemQty;
-
-
-    /**
      * 入库价
      */
     @Excel(name = "入库价")
@@ -115,14 +107,6 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
 
 
     /**
-     * 入库金额 (商品数量*入库价)
-     */
-    @Excel(name = "入库金额 (商品数量*入库价)")
-    @ApiModelProperty(value = "入库金额 (商品数量*入库价)")
-    private BigDecimal itemAmt;
-
-
-    /**
      * 非标号
      */
     @Excel(name = "非标号")

src/main/java/com/dk/mdm/model/pojo/ivt/Outbound.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -177,9 +178,9 @@ public class Outbound extends PageInfo<Outbound> implements Serializable {
      */
     @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime outDate;
+    private LocalDate outDate;
 
 
     /**

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItem.java

@@ -100,14 +100,6 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
 
 
     /**
-     * 商品数量
-     */
-    @Excel(name = "商品数量")
-    @ApiModelProperty(value = "商品数量")
-    private BigDecimal itemQty;
-
-
-    /**
      * 出库价
      */
     @Excel(name = "出库价")
@@ -116,14 +108,6 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
 
 
     /**
-     * 出库金额 (商品数量*入库价)
-     */
-    @Excel(name = "出库金额 (商品数量*入库价)")
-    @ApiModelProperty(value = "出库金额 (商品数量*入库价)")
-    private BigDecimal itemAmt;
-
-
-    /**
      * 非标号
      */
     @Excel(name = "非标号")

src/main/java/com/dk/mdm/model/query/ivt/InboundItemQuery.java

@@ -98,14 +98,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
 
 
     /**
-     * 商品数量
-     */
-    @Excel(name = "商品数量")
-    @ApiModelProperty(value = "商品数量")
-    private BigDecimal itemQty;
-
-
-    /**
      * 入库价
      */
     @Excel(name = "入库价")
@@ -114,14 +106,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
 
 
     /**
-     * 入库金额 (商品数量*入库价)
-     */
-    @Excel(name = "入库金额 (商品数量*入库价)")
-    @ApiModelProperty(value = "入库金额 (商品数量*入库价)")
-    private BigDecimal itemAmt;
-
-
-    /**
      * 非标号
      */
     @Excel(name = "非标号")

src/main/java/com/dk/mdm/model/query/ivt/OutboundItemQuery.java

@@ -99,14 +99,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
 
 
     /**
-     * 商品数量
-     */
-    @Excel(name = "商品数量")
-    @ApiModelProperty(value = "商品数量")
-    private BigDecimal itemQty;
-
-
-    /**
      * 出库价
      */
     @Excel(name = "出库价")
@@ -115,14 +107,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
 
 
     /**
-     * 出库金额 (商品数量*入库价)
-     */
-    @Excel(name = "出库金额 (商品数量*入库价)")
-    @ApiModelProperty(value = "出库金额 (商品数量*入库价)")
-    private BigDecimal itemAmt;
-
-
-    /**
      * 非标号
      */
     @Excel(name = "非标号")

src/main/java/com/dk/mdm/model/query/ivt/OutboundQuery.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -178,9 +179,9 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
      */
     @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime outDate;
+    private LocalDate outDate;
 
 
     /**

src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -98,14 +98,6 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
 
 
     /**
-     * 商品数量
-     */
-    @Excel(name = "商品数量")
-    @ApiModelProperty(value = "商品数量")
-    private BigDecimal itemQty;
-
-
-    /**
      * 入库价
      */
     @Excel(name = "入库价")
@@ -114,14 +106,6 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
 
 
     /**
-     * 入库金额 (商品数量*入库价)
-     */
-    @Excel(name = "入库金额 (商品数量*入库价)")
-    @ApiModelProperty(value = "入库金额 (商品数量*入库价)")
-    private BigDecimal itemAmt;
-
-
-    /**
      * 非标号
      */
     @Excel(name = "非标号")

src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -99,14 +99,6 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
 
 
     /**
-     * 商品数量
-     */
-    @Excel(name = "商品数量")
-    @ApiModelProperty(value = "商品数量")
-    private BigDecimal itemQty;
-
-
-    /**
      * 出库价
      */
     @Excel(name = "出库价")
@@ -115,14 +107,6 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
 
 
     /**
-     * 出库金额 (商品数量*入库价)
-     */
-    @Excel(name = "出库金额 (商品数量*入库价)")
-    @ApiModelProperty(value = "出库金额 (商品数量*入库价)")
-    private BigDecimal itemAmt;
-
-
-    /**
      * 非标号
      */
     @Excel(name = "非标号")

src/main/java/com/dk/mdm/model/response/ivt/OutboundResponse.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -178,9 +179,9 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
      */
     @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime outDate;
+    private LocalDate outDate;
 
 
     /**

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -281,6 +281,27 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
 
     @ApiModelProperty(value = "商品名称")
     private String skuName;
+
+    @ApiModelProperty(value = "订单数量")
+    private BigDecimal orderQty;
+
+    @ApiModelProperty(value = "可出库数量")
+    private BigDecimal canOutingQty;
+
+    @ApiModelProperty(value = "库存ID")
+    private String invId;
+
+    @ApiModelProperty(value = "仓库ID")
+    private String whId;
+
+    @ApiModelProperty(value = "库存数量")
+    private BigDecimal invQty;
+
+    @ApiModelProperty(value = "可用量")
+    private BigDecimal usableQty;
+
+    @ApiModelProperty(value = "仓库名称")
+    private String whName;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/vo/ivt/InboundItemVO.java

@@ -98,14 +98,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
 
 
     /**
-     * 商品数量
-     */
-    @Excel(name = "商品数量")
-    @ApiModelProperty(value = "商品数量")
-    private BigDecimal itemQty;
-
-
-    /**
      * 入库价
      */
     @Excel(name = "入库价")
@@ -114,14 +106,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
 
 
     /**
-     * 入库金额 (商品数量*入库价)
-     */
-    @Excel(name = "入库金额 (商品数量*入库价)")
-    @ApiModelProperty(value = "入库金额 (商品数量*入库价)")
-    private BigDecimal itemAmt;
-
-
-    /**
      * 非标号
      */
     @Excel(name = "非标号")

src/main/java/com/dk/mdm/model/vo/ivt/OutboundItemVO.java

@@ -99,14 +99,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
 
 
     /**
-     * 商品数量
-     */
-    @Excel(name = "商品数量")
-    @ApiModelProperty(value = "商品数量")
-    private BigDecimal itemQty;
-
-
-    /**
      * 出库价
      */
     @Excel(name = "出库价")
@@ -115,14 +107,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
 
 
     /**
-     * 出库金额 (商品数量*入库价)
-     */
-    @Excel(name = "出库金额 (商品数量*入库价)")
-    @ApiModelProperty(value = "出库金额 (商品数量*入库价)")
-    private BigDecimal itemAmt;
-
-
-    /**
      * 非标号
      */
     @Excel(name = "非标号")

src/main/java/com/dk/mdm/model/vo/ivt/OutboundVO.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -179,9 +180,9 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
      */
     @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime outDate;
+    private LocalDate outDate;
 
 
     /**
@@ -317,8 +318,8 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
-    @ApiModelProperty(value = "出库明细")
-    private List<OutboundItemVO> outboundItemList;
+    @ApiModelProperty(value = "明细")
+    private List<OutboundItemVO> itemList;
 
     @ApiModelProperty(value = "删除明细")
     private List<OutboundItemVO> deleteItemList;

src/main/java/com/dk/mdm/model/vo/sale/OrderVO.java

@@ -407,8 +407,8 @@ public class OrderVO extends PageInfo<OrderVO> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
-    @ApiModelProperty(value = "订单明细")
-    private List<OrderItemVO> orderItemList;
+    @ApiModelProperty(value = "明细")
+    private List<OrderItemVO> itemList;
 
     @ApiModelProperty(value = "删除明细")
     private List<OrderItemVO> deleteItemList;

src/main/java/com/dk/mdm/service/ivt/OutboundItemService.java

@@ -13,6 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class OutboundItemService extends BaseService<OutboundItem> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "item_id";
+	}
+
+	@Override
 	public BaseMapper<OutboundItem> getRepository() {
 		return outboundItemMapper;
 	}

src/main/java/com/dk/mdm/service/ivt/OutboundService.java

@@ -36,6 +36,11 @@ import java.util.stream.Collectors;
 public class OutboundService extends BaseService<Outbound> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "out_id";
+	}
+
+	@Override
 	public BaseMapper<Outbound> getRepository() {
 		return outboundMapper;
 	}
@@ -70,17 +75,19 @@ public class OutboundService extends BaseService<Outbound> {
 
 		// 获取单号
 		Map<String , Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.OUTBOUND.getName(),false);
-		outboundVO.setOutId(codeMap.get("outId").toString()).setOutNo(codeMap.get("outNote").toString()).setOutType(Constant.OutType.SALE.getName());
+		outboundVO.setOutId(codeMap.get("outId").toString()).setOutNo(codeMap.get("outNote").toString())
+				.setOutType(Constant.OutType.SALE.getName());
 		// 转化实体
 		Outbound outbound = outboundConvert.convertToPo(outboundVO);
 		// 总单保存
 		super.insert(outbound);
 
 		// 明细保存
-		if (outboundVO.getOutboundItemList() != null && outboundVO.getOutboundItemList().size() > 0) {
-			for (OutboundItemVO outboundItemVO : outboundVO.getOutboundItemList()) {
+		if (outboundVO.getItemList() != null && outboundVO.getItemList().size() > 0) {
+			for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
 				OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
-				outboundItem.setOutId(outbound.getOutId()).setCpId(outbound.getCpId()).setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
+				outboundItem.setOutId(outbound.getOutId()).setCpId(outbound.getCpId()).setOutStatus(Constant.OutStatus.CHUKUZHONG.getName())
+					.setOutType(Constant.OutType.SALE.getName());
 				outboundItemMapper.insert(outboundItem);
 			}
 		}
@@ -116,10 +123,10 @@ public class OutboundService extends BaseService<Outbound> {
 		Outbound outbound = outboundConvert.convertToPo(outboundVO);
 
 		// 编辑的
-		List<OutboundItemVO> editOutboundItemVOList = outboundVO.getOutboundItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
+		List<OutboundItemVO> editOutboundItemVOList = outboundVO.getItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
 		for (OutboundItemVO outboundItemVO : editOutboundItemVOList) {
-			// 商品数量不能小于出库中数量
-			if(outboundItemVO.getItemQty().compareTo(outboundItemVO.getOutingQty()) == -1){
+			// 出库中数量不能小于出库数量
+			if(outboundItemVO.getOutingQty().compareTo(outboundItemVO.getOutQty()) == -1){
 				throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ITEMQTY_NO_LESS_OUTQTY.getMessage());
 			} else {
 				OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);

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

@@ -61,4 +61,17 @@ public class StaffRightService extends BaseService<StaffRight> {
         return  ResponseResultUtil.success(staffRightMapper.deleteById(new StaffRight().setStaffId(id)) > 0) ;
     }
 
+    /**
+     * @desc   : WEB获取员工权限
+     * @author : 常皓宁
+     * @date   : 2024/3/6 13:16
+     */
+    public ResponseResultVO<Map<String, Object>> getStaffRightWeb(Map<String, Object> param) {
+        // 获取系统基础数据
+        List<Map<String, Object>> list = staffRightMapper.getStaffRightWeb(param);
+        Map<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("list", list);
+        return ResponseResultUtil.success(objectObjectHashMap);
+    }
+
 }

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

@@ -13,6 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class OrderItemService extends BaseService<OrderItem> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "item_id";
+	}
+
+	@Override
 	public BaseMapper<OrderItem> getRepository() {
 		return orderItemMapper;
 	}

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

@@ -38,18 +38,13 @@ import java.util.stream.Collectors;
 public class OrderService extends BaseService<Order> {
 
     @Override
-    public BaseMapper<Order> getRepository() {
-        return orderMapper;
+    public String getPrimaryKey() {
+        return "order_id";
     }
 
-    /**
-     * @desc : 重写主键
-     * @author : 付斌
-     * @date : 2023/1/9 10:39
-     */
     @Override
-    public String getPrimaryKey() {
-        return "order_id";
+    public BaseMapper<Order> getRepository() {
+        return orderMapper;
     }
 
     @Autowired
@@ -149,8 +144,8 @@ public class OrderService extends BaseService<Order> {
 //                UUID.fromString(updateOrder.getOrderId())));
 
         // 订单明细保存
-        if (orderVO.getOrderItemList() != null && orderVO.getOrderItemList().size() > 0) {
-            for (OrderItemVO orderItemVO : orderVO.getOrderItemList()) {
+        if (orderVO.getItemList() != null && orderVO.getItemList().size() > 0) {
+            for (OrderItemVO orderItemVO : orderVO.getItemList()) {
                 OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
                 orderItem.setOrderId(order.getOrderId()).setCpId(order.getCpId()).setOutStatus(Constant.OutStatus.DAICHUKU.getName());
                 orderItemMapper.insert(orderItem);
@@ -200,14 +195,14 @@ public class OrderService extends BaseService<Order> {
         }
         // 编辑的（包括新增的）
         // 新增的
-        List<OrderItemVO> insertOrderItemVOList = orderVO.getOrderItemList().stream().filter(it -> it.getItemId() == null).collect(Collectors.toList());
+        List<OrderItemVO> insertOrderItemVOList = orderVO.getItemList().stream().filter(it -> it.getItemId() == null).collect(Collectors.toList());
         for (OrderItemVO orderItemVO : insertOrderItemVOList) {
             OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
             orderItem.setOrderId(order.getOrderId()).setCpId(order.getCpId()).setOutStatus(Constant.OutStatus.DAICHUKU.getName());
             orderItemMapper.insert(orderItem);
         }
         // 编辑的
-        List<OrderItemVO> editOrderItemVOList = orderVO.getOrderItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
+        List<OrderItemVO> editOrderItemVOList = orderVO.getItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
         for (OrderItemVO orderItemVO : editOrderItemVOList) {
             // 商品数量不能小于出库中数量
             if(orderItemVO.getItemQty().compareTo(orderItemVO.getOutingQty()) == -1){
@@ -221,4 +216,20 @@ public class OrderService extends BaseService<Order> {
         return ResponseResultUtil.success(super.update(order, new UpdateWrapper<Order>().lambda().eq(Order::getOrderId,
                 UUID.fromString(order.getOrderId()))));
     }
+
+    /**
+     * @desc   : 获取订单信息（编辑用）
+     * @author : 付斌
+     * @date   : 2024-03-02 17:27
+     */
+    public ResponseResultVO<?> getOrderForOut(String id) {
+        Map<String, Object> orderInfo = new HashMap<>();
+        OrderResponse orderResponse = orderMapper.selectById(id);
+        orderInfo.put("order", orderResponse);
+
+        // 商品明细
+        List<OrderItemResponse> orderItem = orderItemMapper.selectByCondForOut(new OrderItemQuery().setOrderId(id));
+        orderInfo.put("orderItem", orderItem);
+        return ResponseResultUtil.success(orderInfo);
+    }
 }

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

@@ -13,6 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class OutReturnItemService extends BaseService<OutReturnItem> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "item_id";
+	}
+
+	@Override
 	public BaseMapper<OutReturnItem> getRepository() {
 		return outReturnItemMapper;
 	}

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

@@ -13,6 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class OutReturnService extends BaseService<OutReturn> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "return_id";
+	}
+
+	@Override
 	public BaseMapper<OutReturn> getRepository() {
 		return outReturnMapper;
 	}