Merge remote-tracking branch 'origin/master'

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java

@@ -188,11 +188,13 @@ public class TmTaskController extends BaseController {
             }
         }
         // 查询改领料单位下面有没有配置二级库
-        SecondLotConfig config = new SecondLotConfig();
+        if ("1".equals(task.getLeaseType())){
-        config.setUnitId(task.getUnitId());
+            SecondLotConfig config = new SecondLotConfig();
-        SecondLotConfig secondLotConfig = secondaryWarehouseMapper.selectConfigByLotId(config);
+            config.setUnitId(task.getUnitId());
-        if (secondLotConfig == null) {
+            SecondLotConfig secondLotConfig = secondaryWarehouseMapper.selectConfigByLotId(config);
-            return AjaxResult.error("该领料单位未配置二级库，请先配置");
+            if (secondLotConfig == null) {
+                return AjaxResult.error("该领料单位未配置二级库，请先配置");
+            }
         }
         try {
             String code = tmTaskService.genderLeaseCode();