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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java

@@ -93,9 +93,9 @@ public class TWarehouseGoodsTransferController extends BaseController {
         if (StringUtils.isEmpty(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
         }
-        if (StringUtils.isEmpty(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
+        /*if (StringUtils.isEmpty(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
             return AjaxResult.error("提交失败：请检查库存明细数据");
-        }
+        }*/
         if (StringUtils.isEmpty(mblnoStatus)) {
             // 判断是提单号是否在一天当中出现第二次或以上
             AjaxResult result = itWarehouseBillsService.selectContainMblno(tWarehouseBills, billsType);
@@ -127,9 +127,9 @@ public class TWarehouseGoodsTransferController extends BaseController {
         if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
         }
-        if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
+        /*if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
             return AjaxResult.error("未找到仓库明细数据，请确认");
-        }
+        }*/
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
                 tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -152,9 +152,9 @@ public class TWarehouseInStockController extends BaseController {
         if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
         }
-        if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
+        /*if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
             return AjaxResult.error("未找到仓库明细数据，请确认");
-        }
+        }*/
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
                 tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -82,9 +82,9 @@ public class TWarehouseOutStockController extends BaseController {
         if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
         }
-        if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
+        /*if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
             return AjaxResult.error("未找到仓库明细数据，请确认");
-        }
+        }*/
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
                 tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseStockTransferController.java

@@ -197,9 +197,9 @@ public class TWarehouseStockTransferController extends BaseController {
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据，请确认");
         }
-        if (StringUtils.isNull(warehousebillsitems) || "[]".equals(warehousebillsitems)) {
+        /*if (StringUtils.isNull(warehousebillsitems) || "[]".equals(warehousebillsitems)) {
             return AjaxResult.error("未找到仓库明细数据，请确认");
-        }
+        }*/
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.warehouseSubmission(warehouseBills, warehousebillsfeesCr,
                 warehousebillsfeesDr, warehousebillsitems, tEnclosure, loginUser, tCntr, billsType);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -2322,9 +2322,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("提单号已存在，请重新提交");
         }
         TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
-        if (tWarehouseBills.getfBillstatus() != 11L) {
+       /* if (tWarehouseBills.getfBillstatus() != 11L) {
             return AjaxResult.error("订单未审核完成，暂不支持维护提单号");
-        }
+        }*/
         TWarehouseBills bills = new TWarehouseBills();
         /*bills.setfId(warehouseBills.getfId());
         bills.setfMblno(warehouseBills.getfMblno());*/