Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java

@@ -193,13 +193,13 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
         List<IoCollectOrderResponse> orderList = collectOrderMapper.filterList(collectOrderRequest);
         if (CollUtil.isEmpty(orderList)) throw new JsonException("未找到对应的单据!");
         IoCollectOrderResponse order = orderList.get(0);
-        Integer invAlert1 = order.getInvAlert();
-
-        if (lockType == 1) {
-            if (invAlert1 == 1) throw new JsonException("该单据已锁定库存过请勿重复锁定!");
-        } else if (lockType == 2) {
-            if (invAlert1 != 1) throw new JsonException("该单据未正常锁定库存过不可进行解锁库存操作!");
-        }
+//        Integer invAlert1 = order.getInvAlert();
+//
+//        if (lockType == 1) {
+//            if (invAlert1 == 1) throw new JsonException("该单据已锁定库存过请勿重复锁定!");
+//        } else if (lockType == 2) {
+//            if (invAlert1 != 1) throw new JsonException("该单据未正常锁定库存过不可进行解锁库存操作!");
+//        }
 
         //2、获取该单据下的biz明细
         CollectOrderBizRequest bizRequest = new CollectOrderBizRequest();