采购一键作废

销售一键作废

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

@@ -8,6 +8,7 @@ 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 com.dk.mdm.model.response.ivt.OutboundItemResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -115,5 +116,14 @@ public interface InboundItemMapper extends BaseMapper<InboundItem>{
     Long selectHasReturn(InboundItemQuery inboundItemQuery);
 
 
+    /**
+     * @desc   : 根据条件进行查询
+     * @date   : 2024/7/16 8:38
+     * @author : 寇珊珊
+     */
+    List<InboundItemResponse> selectMessageByOtherCondition(InboundItemQuery inboundItemQuery);
+
+
+
 }
 

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

@@ -1097,4 +1097,19 @@
           AND ti.into_type = #{intoType}
     </select>
 
+    <!--根据条件进行查询-->
+    <select id="selectMessageByOtherCondition" resultMap="BaseResultMapResponse">
+        SELECT
+        <include refid="Base_Column_List_Response"/>
+        FROM dkic_b.t_psi_inbound_item tpii
+        <where>
+            <if test="intoId != null and intoId != ''">
+                AND tpii.into_id = #{intoId}::uuid
+            </if>
+            <if test="fromId != null and fromId != ''">
+                AND tpoi.from_id = #{fromId}::uuid
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -124,5 +124,13 @@ public interface OutboundItemMapper extends BaseMapper<OutboundItem>{
      */
     Long selectHasReturn(OutboundItemQuery outboundItemQuery);
 
+
+    /**
+     * @desc   : 根据条件进行查询
+     * @date   : 2024/7/15 17:22
+     * @author : 寇珊珊
+     */
+    List<OutboundItemResponse> selectMessageByOtherCondition(OutboundItemQuery outboundItemQuery);
+
 }
 

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

@@ -869,4 +869,20 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
           AND ti.out_type = #{outType}
     </select>
 
+
+    <!--根据条件进行查询-->
+    <select id="selectMessageByOtherCondition" resultMap="BaseResultMapResponse">
+        SELECT
+        <include refid="Base_Column_List_Response"/>
+        FROM dkic_b.t_psi_outbound_item tpoi
+        <where>
+            <if test="outId != null and outId != ''">
+                AND tpoi.out_id = #{outId}::uuid
+            </if>
+            <if test="fromId != null and fromId != ''">
+                AND tpoi.from_id = #{fromId}::uuid
+            </if>
+        </where>
+    </select>
+
 </mapper>

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -1635,7 +1635,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
      */
     @Transactional(rollbackFor = {Exception.class})
     public ResponseResultVO<?> oneKeyPurchaseInboundRepeal(String orderId) {
-        List<InboundItemResponse> InboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery().setFromId(orderId));
+        List<InboundItemResponse> InboundItemResponses = inboundItemMapper.selectMessageByOtherCondition(new InboundItemQuery().setFromId(orderId));
         if (InboundItemResponses != null && InboundItemResponses.size() > 0) {
             Map<String, List<InboundItemResponse>> inboundItemMap = InboundItemResponses.stream().collect(Collectors.groupingBy(InboundItemResponse::getIntoId));
             for (String str : inboundItemMap.keySet()) {
@@ -1643,7 +1643,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 //根据id查询 此条入库单的数据还未更改前的数据
                 InboundResponse inboundResponse = inboundMapper.selectById(str);
                 //根据总单id查询
-                List<InboundItemResponse> inboundItemResponseList = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(inboundResponse.getIntoId()));
+                List<InboundItemResponse> inboundItemResponseList = inboundItemMapper.selectMessageByOtherCondition(new InboundItemQuery().setIntoId(inboundResponse.getIntoId()));
                 //endregion
 
                 //region 已入库状态作废

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -1946,7 +1946,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
      */
     @Transactional(rollbackFor = {Exception.class})
     public ResponseResultVO<?> oneKeySaleOutboundRepeal(String orderId) {
-        List<OutboundItemResponse> outboundItemResponses = outboundItemMapper.selectByCond(new OutboundItemQuery().setFromId(orderId));
+        List<OutboundItemResponse> outboundItemResponses = outboundItemMapper.selectMessageByOtherCondition(new OutboundItemQuery().setFromId(orderId));
         if (outboundItemResponses != null && outboundItemResponses.size() > 0) {
             Map<String, List<OutboundItemResponse>> outboundItemVOMap = outboundItemResponses.stream().collect(Collectors.groupingBy(OutboundItemResponse::getOutId));
             for (String str : outboundItemVOMap.keySet()) {
@@ -1954,7 +1954,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 //根据id查询 此条出库单的数据还未更改前的数据
                 OutboundResponse outboundResponse = outboundMapper.selectById(str);
                 //根据总单id查询
-                List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(outboundResponse.getOutId()));
+                List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectMessageByOtherCondition(new OutboundItemQuery().setOutId(outboundResponse.getOutId()));
 
                 //endregion
 

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -125,7 +125,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
     @Transactional(rollbackFor = {Exception.class})
     public void updatePrimaryTotal(OutboundVO outboundVO) {
 
-        //region 原入库单
+        //region 原出库单
         Map<String, List<OutboundItemVO>> outboundItemVOListOutPri = outboundVO.getItemList().stream().filter(it -> it.getSOrderId() != null).collect(Collectors.groupingBy(OutboundItemVO::getSOutId));
         for (String str : outboundItemVOListOutPri.keySet()) {
             List<OutboundItemVO> outboundItemList = outboundItemVOListOutPri.get(str);
@@ -523,7 +523,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         }
         //endregion
 
-        //region 原入库单  原销售订单
+        //region 原出库单  原销售订单
         this.updatePrimaryTotal(outboundVO);
         //endregion