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

src/main/java/com/gaotao/config/ShiroConfig.java

@@ -55,6 +55,7 @@ public class ShiroConfig {
         filterMap.put("/api/wms54/**", "anon");//海安立库接口
         filterMap.put("/api/dashboard/**", "anon");//看板接口
         filterMap.put("/ws/dashboard/**", "anon");//看板接口
+        filterMap.put("/api/handlingunit/**", "anon");//hu对外接口
         filterMap.put("/swagger/**", "anon");
         filterMap.put("/v2/api-docs", "anon");
         filterMap.put("/swagger-ui.html", "anon");

src/main/java/com/gaotao/modules/api/controller/HandlingUnitApiController.java

@@ -0,0 +1,33 @@
+package com.gaotao.modules.api.controller;
+
+import com.gaotao.common.utils.R;
+import com.gaotao.modules.handlingunit.entity.HandlingUnit;
+import com.gaotao.modules.handlingunit.entity.dto.*;
+import com.gaotao.modules.handlingunit.service.HandlingUnitService;
+import com.gaotao.modules.sys.controller.AbstractController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RequestMapping("/api/handlingunit")
+@RestController
+public class HandlingUnitApiController extends AbstractController {
+
+    @Autowired
+    private HandlingUnitService handlingUnitService;
+
+    /**
+     * 查询处理单元详情
+     */
+    @PostMapping("getHandlingUnitDetail")
+    public R getHandlingUnitDetail(@RequestBody HandlingUnitDto dto) {
+        HandlingUnit detail = handlingUnitService.getHandlingUnit(dto.getSite(), dto.getUnitId());
+        return R.ok().put("data", detail);
+    }
+
+
+}

src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java

@@ -23,6 +23,12 @@ public interface HandlingUnitService extends IService<HandlingUnit> {
      * 查询处理单元详情
      */
     HandlingUnitDto getHandlingUnitDetail(String site, String unitId);
+
+    /**
+     * 对外接口：扫描处理单元标签
+     */
+    HandlingUnit getHandlingUnit(String site, String unitId);
+
     HandlingUnitDto scanHandlingUnitLabelForYiKu(String site, String unitId);
 
     HandlingUnitDto scanHandlingUnitLabelForOther(String site, String unitId);

src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java

@@ -57,6 +57,11 @@ public class HandlingUnitServiceImpl extends ServiceImpl<HandlingUnitMapper, Han
         return baseMapper.selectHandlingUnitDetail(site, unitId);
     }
 
+    @Override
+    public HandlingUnit getHandlingUnit(String site, String unitId) {
+        return this.lambdaQuery().eq(HandlingUnit::getSite, site).eq(HandlingUnit::getUnitId, unitId).one();
+    }
+
     @Override
     public HandlingUnitDto scanHandlingUnitLabelForYiKu(String site, String unitId) {
         HandlingUnitDto unitDetail = this.getHandlingUnitDetail(site, unitId);

src/main/java/com/gaotao/modules/production/service/impl/AutoIssueServiceImpl.java

@@ -20,6 +20,8 @@ import java.util.List;
 @Service
 public class AutoIssueServiceImpl implements AutoIssueService {
 
+    private static final long IFS_CALL_INTERVAL_MS = 20L;
+
     @Autowired
     private IfsApiIssueAndReturnService ifsApiIssueAndReturnService;
 
@@ -44,6 +46,8 @@ public class AutoIssueServiceImpl implements AutoIssueService {
                     resultDto.getFailures().add(buildFailure(shopOrder, handlingUnit, e.getMessage()));
                     log.error("自动发料失败, shopOrder={}, label={}, error={}",
                             getOrderNo(shopOrder), getLabelCode(handlingUnit), e.getMessage(), e);
+                } finally {
+                    sleepAfterIfsCall();
                 }
             }
         }
@@ -130,4 +134,13 @@ public class AutoIssueServiceImpl implements AutoIssueService {
     private String defaultIfBlank(String value, String defaultValue) {
         return StringUtils.isBlank(value) ? defaultValue : value;
     }
+
+    private void sleepAfterIfsCall() {
+        try {
+            Thread.sleep(IFS_CALL_INTERVAL_MS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new XJException("自动发料等待间隔被中断");
+        }
+    }
 }