Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

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

@@ -5,6 +5,7 @@ import com.dk.mdm.model.pojo.ivt.InboundItem;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.ivt.InboundItemQuery;
 import com.dk.mdm.model.query.ivt.InboundQuery;
+import com.dk.mdm.model.query.ivt.OutboundItemQuery;
 import com.dk.mdm.model.response.ivt.InboundItemResponse;
 import com.dk.mdm.model.response.ivt.InboundResponse;
 import org.apache.ibatis.annotations.Param;
@@ -106,6 +107,13 @@ public interface InboundItemMapper extends BaseMapper<InboundItem>{
 
     Long countByCondList(InboundItemQuery inboundItemQuery);
 
+    /**
+     * @desc   : 查询当前订单下是否存在退货单
+     * @date   : 2024/7/10 10:30
+     * @author : 寇珊珊
+     */
+    Long selectHasReturn(InboundItemQuery inboundItemQuery);
+
 
 }
 

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

@@ -1062,4 +1062,13 @@
         A."shortName") AS B
     </select>
 
+    <!--查询当前订单下是否存在退货单-->
+    <select id="selectHasReturn" resultType="Long">
+        SELECT count(1)
+        FROM dkic_b.t_psi_inbound_item
+        where flg_valid = #{flgValid}
+          AND s_pur_id = #{sPurId}
+          AND into_type = #{intoType}
+    </select>
+
 </mapper>

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

@@ -116,6 +116,12 @@ public interface OutboundItemMapper extends BaseMapper<OutboundItem>{
      */
     int updateLastCost(OutboundItemQuery outboundItemQuery);
 
+    /**
+     * @desc   : 查询当前订单下是否存在退货单
+     * @date   : 2024/7/10 10:30
+     * @author : 寇珊珊
+     */
+    Long selectHasReturn(OutboundItemQuery outboundItemQuery);
 
 }
 

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

@@ -211,7 +211,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                 AND tpoi.cp_id = #{cpId}
             </if>
             <if test="sOrderId != null">
-                AND tpoi.s_order_id = #{sOrderId}
+                AND tpoi.s_order_id = #{sOrderId,typeHandler=UuidTypeHandler}
             </if>
         </where>
     </sql>
@@ -845,6 +845,13 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
              and tpoi.out_id=#{id}::uuid
     </select>
 
-
+    <!--查询当前订单下是否存在退货单-->
+    <select id="selectHasReturn" resultType="Long">
+        SELECT count(1)
+        FROM dkic_b.t_psi_outbound_item
+        where flg_valid = #{flgValid}
+          AND s_order_id = #{sOrderId, typeHandler=UuidTypeHandler}
+          AND out_type = #{outType}
+    </select>
 
 </mapper>

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

@@ -6,6 +6,7 @@ import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -284,10 +285,15 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery>  {
 
     @ApiModelProperty(value = "源采购订单ID（采购退货时记录）")
     @TableField(typeHandler = UuidTypeHandler.class)
+    @JsonProperty(value = "sPurId")
     private String sPurId;
+    public String getsPurId() {
+        return sPurId;
+    }
 
     @ApiModelProperty(value = "源采购明细ID（采购退货时记录）")
     @TableField(typeHandler = UuidTypeHandler.class)
+    @JsonProperty(value = "sPurItemId")
     private String sPurItemId;
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

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

@@ -202,9 +202,16 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery>{
     private String sOutItemId;
 
     @ApiModelProperty(value = "源销售订单ID")
+    @JsonProperty(value = "sOrderId")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String sOrderId;
+    public String getsOrderId() {
+        return sOrderId;
+    }
 
     @ApiModelProperty(value = "源销售明细ID")
+    @JsonProperty(value = "sOrderItemId")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String sOrderItemId;
 
     @Excel(name = "箱（出库中）")
@@ -247,9 +254,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery>{
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
 
-
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/vo/pur/PurchaseItemVO.java

@@ -323,7 +323,18 @@ public class PurchaseItemVO extends PageInfo<PurchaseItemVO> implements Serializ
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
+    /**
+     * 入库核对单价
+     */
+    @ApiModelProperty(value = "入库核对单价")
+    private BigDecimal costPrice;
+
 
+    /**
+     * 入库核对金额
+     */
+    @ApiModelProperty(value = "入库核对金额")
+    private BigDecimal costAmt;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -219,6 +219,11 @@ public class PurchaseService extends BaseService<Purchase> {
                 inboundItemVO.setIntoingQty(purchaseItemVO.getItemQty());
                 //已入库数量
                 inboundItemVO.setIntoingAmt(purchaseItemVO.getItemAmt());
+                //todo 2024年7月10日10:19:01 成本单价和成本金额取前台传入的采购单价和采购金额 dl和z确认
+                //成本单价
+                inboundItemVO.setCostPrice(purchaseItemVO.getPricePur());
+                //成本基恩
+                inboundItemVO.setCostAmt(purchaseItemVO.getItemAmt());
                 //endregion
 
                 //region 根据sku查询商品信息
@@ -262,6 +267,10 @@ public class PurchaseService extends BaseService<Purchase> {
             //已入库数量
             inboundVO.setIntoingAmt(purchasevo.getSumAmount());
             inboundVO.setItemList(inboundItemVOList);
+            //来源id
+            inboundVO.setFromId(purchasevo.getPurId());
+            //来源单号
+            inboundVO.setFromNo(purchasevo.getPurNo());
             //endregion
             //新建采购入库单
             inboundPurchaseService.purchaseInboundInsert(inboundVO);
@@ -529,11 +538,11 @@ public class PurchaseService extends BaseService<Purchase> {
      */
     public ResponseResultVO<?> oneKeyInvalid(String id) {
         //region  查询当前订单下是否有退货单
-        List<InboundItemResponse> inboundItemReturnResponses = inboundItemMapper.selectByCond(new InboundItemQuery()
+        Long count = inboundItemMapper.selectHasReturn(new InboundItemQuery()
                 .setSPurId(id)
                 .setFlgValid(true)
                 .setIntoType(Constant.IntoType.PURRETURN_RETURN.getName()));
-        if (inboundItemReturnResponses != null && inboundItemReturnResponses.size() > 0) {
+        if (count != null && count > 0) {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORDER_IS_EXISTS_RETURN_ORDERS.getMessage());
         }
         //endregion

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

@@ -1098,13 +1098,14 @@ public class OrderService extends BaseService<Order> {
      * @date : 2024/7/1 13:26
      * @author : 寇珊珊
      */
+
     public ResponseResultVO<?> oneKeyInvalid(String id) {
         //region  查询当前订单下是否存在有效的退货单
-        List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery()
+        Long count = outboundItemMapper.selectHasReturn(new OutboundItemQuery()
                 .setSOrderId(id)
                 .setFlgValid(true)
-                .setOutType(Constant.OutType.SALE_RETURN.getName()) );
-        if (outboundItemResponseList != null && outboundItemResponseList.size() > 0) {
+                .setOutType(Constant.OutType.SALE_RETURN.getName()));
+        if (count != null && count > 0) {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORDER_IS_EXISTS_RETURN_ORDERS.getMessage());
         }
         //endregion