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 fc5ef1c..3a69b96 100644 --- a/src/main/java/com/srq/modules/productionWarehousing/controller/ProductionWarehousingController.java +++ b/src/main/java/com/srq/modules/productionWarehousing/controller/ProductionWarehousingController.java @@ -48,4 +48,14 @@ public class ProductionWarehousingController { productionWarehousingService.receiveProductionWarehousing(data); return R.ok(); } + + /** + * 获取送检单数据 + * @param inData + * @return + */ + @PostMapping("/getProductionInspection") + public R getProductionInspection(@RequestBody ProductionWarehousingEntity 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 0d396b7..5a408a7 100644 --- a/src/main/java/com/srq/modules/productionWarehousing/service/ProductionWarehousingService.java +++ b/src/main/java/com/srq/modules/productionWarehousing/service/ProductionWarehousingService.java @@ -2,7 +2,7 @@ package com.srq.modules.productionWarehousing.service; import com.srq.common.utils.PageUtils; -import com.srq.modules.orderIssure.entity.IssureNotifyEntity; +import com.alibaba.fastjson.JSONArray; import com.srq.modules.productionWarehousing.entity.ProductionWarehousingEntity; import java.util.List; @@ -12,4 +12,6 @@ public interface ProductionWarehousingService { PageUtils searchProductionWarehousingInfo(ProductionWarehousingEntity data); void receiveProductionWarehousing(ProductionWarehousingEntity data); + + JSONArray getProductionInspection(ProductionWarehousingEntity 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 387b72c..d98b660 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 @@ -1,11 +1,11 @@ package com.srq.modules.productionWarehousing.service.impl; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.srq.common.utils.PageUtils; import com.srq.modules.base.utils.HttpClientUtil; import com.srq.modules.base.utils.ResponseData; -import com.srq.modules.orderIssure.entity.IssureNotifyEntity; import com.srq.modules.productionWarehousing.entity.ProductionWarehousingEntity; import com.srq.modules.productionWarehousing.mapper.ProductionWarehousingMapper; import com.srq.modules.productionWarehousing.service.ProductionWarehousingService; @@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @@ -66,4 +65,17 @@ public class ProductionWarehousingServiceImpl implements ProductionWarehousingSe throw new RuntimeException("IFS接收生产入库失败"); } } + + @Override + public JSONArray getProductionInspection(ProductionWarehousingEntity inData) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("contract", "S01"); + jsonObject.put("wdr", "3H24-5092"); + jsonObject.put("lotNo", "*"); + ResponseData responseData = HttpClientUtil.doPostByRawWithSRQ(apiUrl+"/order/getPrintProductionSheet", jsonObject); + if (!"200".equals(responseData.getCode())) { + throw new RuntimeException("获取IFS数据失败"); + } + return JSON.parseArray(String.valueOf(responseData.getObj())); + } }