作废校验

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

@@ -205,7 +205,7 @@
 
     <sql id="Condition_Response">
         <where>
-             AND tpir.return_status != '退货状态-作废' 
+             AND tpir.return_status != '退货状态-作废'
             <if test="returnNo != null and returnNo != ''">
                 AND tpir.return_no = #{returnNo}
             </if>

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

@@ -335,7 +335,11 @@ public class IntoReturnService extends BaseService<IntoReturn> {
                 //当前单据已经作废，不能重复操
                 return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
             }
-
+            //非出库中单据不能作废
+            if (intoReturnResponse.getOutStatus().equals(Constant.OutStatus.YICHUKU.getName())) {
+                return ResponseResultUtil.error(ErrorCodeEnum.NO_WAIT_INTO_RETURN_CANCEL.getCode(),
+                        ErrorCodeEnum.NO_WAIT_INTO_RETURN_CANCEL.getMessage());
+            }
 
             //查询采购单
             PurchaseResponse purchaseResponse = purchaseMapper.selectById(intoReturnResponse.getPurId());
@@ -404,7 +408,7 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             //修改 负向入库单明细 状态
 
             List<InboundItemResponse> inboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(intoReturnResponse.getIntoId()));
-            if(inboundItemResponses != null && inboundItemResponses.size() > 0){
+            if (inboundItemResponses != null && inboundItemResponses.size() > 0) {
                 for (InboundItemResponse inboundItemRespons : inboundItemResponses) {
                     inboundItemMapper.updateIntoStatus(new InboundItem().setItemId(inboundItemRespons.getItemId()).setIntoStatus(Constant.IntoStatus.ZUOFEI.getName()));
                 }