订单退货

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

@@ -260,7 +260,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_psi_outbound
-        WHERE out_id = #{outId}
+        WHERE out_id = #{id}::uuid
         for update
     </select>
 

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

@@ -201,7 +201,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_psi_order_item
-        WHERE item_id = #{itemId}
+        WHERE item_id = #{id}::uuid
         for update
     </select>
 

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

@@ -209,7 +209,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_psi_out_return_item
-        WHERE item_id = #{itemId}
+        WHERE item_id = #{id}::uuid
         for update
     </select>
 

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

@@ -321,7 +321,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_psi_out_return
-        WHERE return_id = #{returnId}
+        WHERE return_id = #{id}::uuid
         for update
     </select>
 

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

@@ -240,7 +240,7 @@ public class OutboundService extends BaseService<Outbound> {
     public ResponseResultVO<?> invalid(String id) {
         Outbound outbound = outboundMapper.selectByIdForUpdate(id);
         // 如果退货数量不是0，不能作废
-        if (!outbound.getReturnQty().equals(new BigDecimal(0))) {
+        if (outbound.getReturnQty().compareTo(BigDecimal.ZERO) != 0) {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_AFTER_OPERATE.getMessage());
         }
 
@@ -269,7 +269,7 @@ public class OutboundService extends BaseService<Outbound> {
                 .setOutingAmt(orderForUpdate.getOutingAmt().subtract(new BigDecimal(sumOutingAmt)))
                 .setOrderId(outbound.getFromId());
         // 如果出库中数量为0了，更新状态为待出库
-        if(orderUpdate.getOutingQty().equals(new BigDecimal(0))){
+        if (orderUpdate.getOutingQty().compareTo(BigDecimal.ZERO) == 0) {
             orderUpdate.setOutStatus(Constant.OutStatus.DAICHUKU.getName());
         }
         orderService.updateByUuid(orderUpdate);

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

@@ -212,7 +212,7 @@ public class OrderService extends BaseService<Order> {
     public ResponseResultVO<?> invalid(String id) {
         Order order = orderMapper.selectByIdForUpdate(id);
         // 如果状态不是待出库，出库中数量不是0，不能作废
-        if (!order.getOutStatus().equals(Constant.OutStatus.DAICHUKU.getName()) || !order.getOutingQty().equals(new BigDecimal(0)) ) {
+        if (!order.getOutStatus().equals(Constant.OutStatus.DAICHUKU.getName()) || order.getOutingQty().compareTo(BigDecimal.ZERO) != 0) {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_AFTER_OPERATE.getMessage());
         }
         // 作废

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

@@ -214,6 +214,16 @@ public class OutReturnService extends BaseService<OutReturn> {
      * @date   : 2024-03-08 16:38
      */
     public ResponseResultVO<?> invalid(String id) {
+        OutReturn outReturnForUpdate = outReturnMapper.selectByIdForUpdate(id);
+        // 如果数量不是0，不能作废
+        if (outReturnForUpdate.getIntoQty().compareTo(BigDecimal.ZERO) != 0) {
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_AFTER_OPERATE.getMessage());
+        }
+        // 作废
+        OutReturn outReturnUpdate = new OutReturn();
+        outReturnUpdate.setFlgValid(false).setReturnId(id);
+        super.update(outReturnUpdate, new UpdateWrapper<OutReturn>().lambda().eq(OutReturn::getReturnId,
+                UUID.fromString(outReturnForUpdate.getReturnId())));
         return ResponseResultUtil.success();
     }
 }