diff --git a/src/main/java/com/srq/modules/productionWarehousing/controller/ProductionWarehousingController.java b/src/main/java/com/srq/modules/productionWarehousing/controller/ProductionWarehousingController.java index 3a69b96..f1add52 100644 --- a/src/main/java/com/srq/modules/productionWarehousing/controller/ProductionWarehousingController.java +++ b/src/main/java/com/srq/modules/productionWarehousing/controller/ProductionWarehousingController.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; @RestController @RequestMapping("productionWarehousing") @@ -55,7 +56,7 @@ public class ProductionWarehousingController { * @return */ @PostMapping("/getProductionInspection") - public R getProductionInspection(@RequestBody ProductionWarehousingEntity inData){ + public R getProductionInspection(@RequestBody Map inData){ return R.ok().put("rows", productionWarehousingService.getProductionInspection(inData)); } } diff --git a/src/main/java/com/srq/modules/productionWarehousing/service/ProductionWarehousingService.java b/src/main/java/com/srq/modules/productionWarehousing/service/ProductionWarehousingService.java index 5a408a7..173868b 100644 --- a/src/main/java/com/srq/modules/productionWarehousing/service/ProductionWarehousingService.java +++ b/src/main/java/com/srq/modules/productionWarehousing/service/ProductionWarehousingService.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray; import com.srq.modules.productionWarehousing.entity.ProductionWarehousingEntity; import java.util.List; +import java.util.Map; public interface ProductionWarehousingService { @@ -13,5 +14,5 @@ public interface ProductionWarehousingService { void receiveProductionWarehousing(ProductionWarehousingEntity data); - JSONArray getProductionInspection(ProductionWarehousingEntity inData); + JSONArray getProductionInspection(Map inData); } diff --git a/src/main/java/com/srq/modules/productionWarehousing/service/impl/ProductionWarehousingServiceImpl.java b/src/main/java/com/srq/modules/productionWarehousing/service/impl/ProductionWarehousingServiceImpl.java index 1fb2e34..cf3e79a 100644 --- a/src/main/java/com/srq/modules/productionWarehousing/service/impl/ProductionWarehousingServiceImpl.java +++ b/src/main/java/com/srq/modules/productionWarehousing/service/impl/ProductionWarehousingServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; @Service @@ -88,11 +89,11 @@ public class ProductionWarehousingServiceImpl implements ProductionWarehousingSe } @Override - public JSONArray getProductionInspection(ProductionWarehousingEntity inData) { + public JSONArray getProductionInspection(Map data) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("contract", "S01"); - jsonObject.put("wdr", "3H24-5092"); - jsonObject.put("lotNo", "*"); + jsonObject.put("contract", data.get("site")); + jsonObject.put("wdr", data.get("waivDevRejNo")); + jsonObject.put("lotNo", data.get("serialNo")); ResponseData responseData = HttpClientUtil.doPostByRawWithSRQ(apiUrl+"/order/getPrintProductionSheet", jsonObject); if (!"200".equals(responseData.getCode())) { throw new RuntimeException("获取IFS数据失败");