|
@@ -1,8 +1,7 @@
|
|
|
package com.ruoyi.web.controller.warewms.api;
|
|
|
|
|
|
-import com.ruoyi.common.annotation.Log;
|
|
|
+import cn.hutool.http.HttpRequest;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
-import com.ruoyi.common.enums.BusinessType;
|
|
|
import com.ruoyi.web.controller.warewms.pda.PdaDocAsnController;
|
|
|
import com.ruoyi.web.controller.warewms.pda.PdaDocQcController;
|
|
|
import io.swagger.annotations.Api;
|
|
@@ -10,15 +9,9 @@ import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.Data;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-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 org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* @author JWK
|
|
@@ -36,6 +29,20 @@ public class HualanApiController {
|
|
|
@Autowired
|
|
|
private PdaDocQcController pdaDocQcController;
|
|
|
|
|
|
+ /**
|
|
|
+ * 半成品入库时,人工操作PDA扫描周转箱外箱二维码,二维码内容为生产批号,WMS通过批号获取华兰上游系统的生产数据
|
|
|
+ *
|
|
|
+ * @param batchNum
|
|
|
+ * @param boxNo
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @ApiOperation("获取产品数据")
|
|
|
+ @GetMapping("getSkuInfo")
|
|
|
+ public AjaxResult getSkuInfo(String batchNum, String boxNo) {
|
|
|
+ HttpRequest httpRequest = HttpRequest.get("");
|
|
|
+ return AjaxResult.success();
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 半成品回库
|
|
|
*
|
|
@@ -106,5 +113,15 @@ public class HualanApiController {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ @Data
|
|
|
+ public static class SkuInfo {
|
|
|
+ private String material;
|
|
|
+ private String batchNum;
|
|
|
+ private int quantity;
|
|
|
+ private double weight;
|
|
|
+ private Date productDate;
|
|
|
+ private String boxNo;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|