pda接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/api/PadController.java

@@ -2,16 +2,21 @@ package com.ruoyi.web.controller.warewms.api;
 
 import com.ruoyi.ams.asn.form.StockForm;
 import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
+import com.ruoyi.ams.common.vo.DictVO;
+import com.ruoyi.ams.config.domain.vo.LotattConfigVO;
+import com.ruoyi.ams.config.service.ILotattConfigService;
 import com.ruoyi.base.service.ICodeSkuRelationshipService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.server.Sys;
-import org.aspectj.weaver.loadtime.Aj;
+import com.ruoyi.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,15 +26,41 @@ import java.util.Map;
  * Description:
  */
 @RestController
-@RequestMapping("/api/docAsn")
+@RequestMapping("/api")
 public class PadController {
 
     @Autowired
     private IWmsDocAsnHeaderService wmsDocAsnHeaderService;
     @Autowired
     private ICodeSkuRelationshipService codeSkuRelationshipService;
+    @Autowired
+    private ILotattConfigService lotattConfigService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
+    @GetMapping("/config/lotattConfig")
+    public AjaxResult lotattConfigList() {
+        List<LotattConfigVO> lotattConfigVOList = lotattConfigService.queryLotattConfigListActive();
+        return AjaxResult.success(lotattConfigVOList);
+    }
+
+    @GetMapping("/base/dict")
+    public AjaxResult dict(@RequestParam String dictType) {
+        SysDictData query = new SysDictData();
+        query.setStatus("0");
+        query.setDictType(dictType);
+        List<SysDictData> dictDataList = sysDictDataService.selectDictDataList(query);
+        List<DictVO> result = new ArrayList<>();
+        for (SysDictData dictData : dictDataList) {
+            DictVO vo = new DictVO();
+            vo.setLabel(dictData.getDictLabel());
+            vo.setValue(dictData.getDictValue());
+            result.add(vo);
+        }
+        return AjaxResult.success(result);
+    }
 
-    @PostMapping("/stock")
+    @PostMapping("/docAsn/stock")
     @Log(title = "码盘", businessType = BusinessType.INSERT)
     public AjaxResult stock(@RequestBody StockForm stockForm) {
         if (stockForm.getStockTag().equals("Y") && StringUtils.isEmpty(stockForm.getOrderNo())) {
@@ -38,7 +69,7 @@ public class PadController {
         return wmsDocAsnHeaderService.doStock(stockForm);
     }
 
-    @PostMapping("/snCheck")
+    @PostMapping("/docAsn/snCheck")
     public AjaxResult snCheck(@RequestBody Map<String, String> param) {
         String sn = param.get("sn");
         if (StringUtils.isEmpty(sn)) {

ruoyi-admin/src/test/java/com/ruoyi/admin/test/base/WarehouseTest.java

@@ -9,7 +9,6 @@ import com.ruoyi.ams.config.domain.dto.InWarehouseDTO;
 import com.ruoyi.ams.business.IBusinessService;
 import com.ruoyi.ams.config.domain.dto.LotattDTO;
 import com.ruoyi.ams.config.domain.dto.OutWarehouseDTO;
-import com.ruoyi.ams.config.domain.vo.FlowConfigHeaderVO;
 import com.ruoyi.ams.config.mapper.AsnSoStrategyMapper;
 import com.ruoyi.ams.config.service.IFlowConfigHeaderService;
 import com.ruoyi.ams.config.service.LocationAllocationStrategy;
@@ -21,26 +20,20 @@ import com.ruoyi.ams.order.mapper.WmsDocOrderDetailsMapper;
 import com.ruoyi.ams.order.vo.StockOrderVO;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.BaseWarehouse;
-import com.ruoyi.base.domain.LotattVO;
 import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
 import com.ruoyi.base.mapper.BaseLocationInfoMapper;
 import com.ruoyi.base.mapper.BaseSkuMapper;
 import com.ruoyi.base.service.IBaseLocationInfoService;
-import com.ruoyi.base.service.IBaseLocationZoneService;
 import com.ruoyi.base.service.IBaseWarehouseService;
 import com.ruoyi.base.service.SysIdsequenceService;
-import com.ruoyi.framework.web.domain.server.Sys;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by IntelliJ IDEA.

warewms-ams/src/main/java/com/ruoyi/ams/common/vo/DictVO.java

@@ -0,0 +1,9 @@
+package com.ruoyi.ams.common.vo;
+
+import lombok.Data;
+
+@Data
+public class DictVO {
+    private String label;
+    private String value;
+}

warewms-ams/src/main/java/com/ruoyi/ams/config/mapper/LotattConfigMapper.java

@@ -66,6 +66,10 @@ public interface LotattConfigMapper {
      */
     List<LotattConfigVO> queryLotattConfigList();
 
+    /**
+     * 查询启用的批次属性配置
+     * @return
+     */
     List<LotattConfigVO> queryLotattConfigListActive();
 
     /**

warewms-base/src/main/java/com/ruoyi/base/domain/vo/BaseLocationLotattVO.java

@@ -1,7 +1,6 @@
 package com.ruoyi.base.domain.vo;
 
 import com.ruoyi.base.domain.BaseLocationInfo;
-import com.ruoyi.base.domain.LotattVO;
 
 import java.util.HashMap;
 import java.util.Map;

warewms-base/src/main/java/com/ruoyi/base/domain/vo/LotattInfo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.base.domain.vo;
 
-import com.ruoyi.base.domain.LotattVO;
-
 import java.util.HashMap;
 import java.util.Map;
 

warewms-base/src/main/java/com/ruoyi/base/domain/LotattVO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.base.domain;
+package com.ruoyi.base.domain.vo;
 
 /**
  * Created by IntelliJ IDEA.

warewms-base/src/main/java/com/ruoyi/base/mapper/BaseLocationInfoMapper.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.base.domain.BaseLocationInfo;
-import com.ruoyi.base.domain.LotattVO;
+import com.ruoyi.base.domain.vo.LotattVO;
 import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
 import org.apache.ibatis.annotations.Param;
 

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseLocationInfoServiceImpl.java

@@ -6,12 +6,10 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.ruoyi.base.domain.BaseLocationZone;
-import com.ruoyi.base.domain.LotattVO;
 import com.ruoyi.base.domain.vo.*;
 import com.ruoyi.base.mapper.BaseLocationZoneMapper;
 import com.ruoyi.base.utils.CommonUtils;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;