From 8df119402631c67a4f324e8854990b96accc0379 Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Mon, 11 Sep 2023 18:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A29-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervise/gf/biz/instock/InStockRest.java | 8 ++++ .../gf/biz/outstock/OutStockRest.java | 8 ++++ .../yxt/supervise/gf/shanhai/ShRequester.java | 40 +++++++++++++++++++ .../req/In_stockGetRecordMaterielList.java | 2 +- .../req/Out_stockGetRecordMaterielList.java | 2 +- .../shanhai/req/Purchase_contract_index.java | 1 + 6 files changed, 59 insertions(+), 2 deletions(-) diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java index 9d24097..83f4932 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java @@ -79,4 +79,12 @@ public class InStockRest { BaseResponse> api$system$in_stock$get_record_materiel_list = ShRequester.getApi$system$in_stock$get_record_materiel_list(in_stockGetRecordMaterielList); return rb.success().setData(api$system$in_stock$get_record_materiel_list); } + + @GetMapping("/getInType") + @ApiOperation(value = "获取入库类型") + public ResultBean getOutType(){ + ResultBean rb = ResultBean.fireFail(); + BaseResponse api$system$out_stock$get_type = ShRequester.getApi$system$in_stock$get_type(); + return rb.success().setData(api$system$out_stock$get_type); + } } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java index d684ffc..4953cd1 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java @@ -75,4 +75,12 @@ public class OutStockRest { BaseResponse> api$system$out_stock$get_record_materiel_list = ShRequester.getApi$system$out_stock$get_record_materiel_list(out_stockGetRecordMaterielList); return rb.success().setData(api$system$out_stock$get_record_materiel_list); } + + @GetMapping("/getOutType") + @ApiOperation(value = "获取出库类型") + public ResultBean getOutType(){ + ResultBean rb = ResultBean.fireFail(); + BaseResponse api$system$out_stock$get_type = ShRequester.getApi$system$out_stock$get_type(); + return rb.success().setData(api$system$out_stock$get_type); + } } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java index 2db190a..8dabd03 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java @@ -40,6 +40,8 @@ public class ShRequester { private static String material_brand$index = "/api/system/material_brand/index"; //25.物料品牌 private static String materiel$index = "/api/system/materiel/index"; //26.物料管理 private static String materiel$get_materiel_group = "/api/system/materiel/get_materiel_group"; //27.获取物料组 + private static String out_stock$get_type = "/api/system/out_stock/get_type"; //28.获取出库类型 + private static String in_stock$get_type = "/api/system/in_stock/get_type"; //29.获取入库类型 /** * 1.待配货列表 * @@ -596,6 +598,44 @@ public class ShRequester { return resp; } + /** + * @Description //描述： 28. 获取出库类型 + * @Param [] + * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse + **/ + public static BaseResponse getApi$system$out_stock$get_type(){ + BaseResponse resp = new BaseResponse<>(); + String s = ShHttp.doGet(out_stock$get_type, null); + JSONObject jsonObject = JSONUtil.parseObj(s); + String code = jsonObject.get("code").toString(); + String msg = jsonObject.get("msg").toString(); + resp.setCode(Integer.parseInt(code)); + resp.setMsg(msg); + Boolean a = jsonObject.get("data").toString().equals("null") || jsonObject.get("data") == null; + JSONObject data = a ? null : (JSONObject)jsonObject.get("data"); + resp.setData(data); + return resp; + } + + /** + * @Description //描述： 29. 获取入库类型 + * @Param [] + * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse + **/ + public static BaseResponse getApi$system$in_stock$get_type(){ + BaseResponse resp = new BaseResponse<>(); + String s = ShHttp.doGet(in_stock$get_type, null); + JSONObject jsonObject = JSONUtil.parseObj(s); + String code = jsonObject.get("code").toString(); + String msg = jsonObject.get("msg").toString(); + resp.setCode(Integer.parseInt(code)); + resp.setMsg(msg); + Boolean a = jsonObject.get("data").toString().equals("null") || jsonObject.get("data") == null; + JSONObject data = a ? null : (JSONObject)jsonObject.get("data"); + resp.setData(data); + return resp; + } + /** * @Description //描述： 将Json格式数据封装成统一返回对象 * @Param [s, resp, respObj] diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java index 6e6ce57..0fcace3 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java @@ -12,7 +12,7 @@ import lombok.Data; @ApiModel(value = "入库记录",description = "入库记录列表") public class In_stockGetRecordMaterielList { @ApiModelProperty("仓库id") - private String storehouse_id; + private String inp_storehouse_id; @ApiModelProperty("批次号") private String batch_number; @ApiModelProperty("开始时间") diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockGetRecordMaterielList.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockGetRecordMaterielList.java index f820f94..50d11b5 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockGetRecordMaterielList.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockGetRecordMaterielList.java @@ -12,7 +12,7 @@ import lombok.Data; @ApiModel(value = "出库记录列表",description = "出库导出") public class Out_stockGetRecordMaterielList { @ApiModelProperty("仓库id") - private String storehouse_id; + private String out_storehouse_id; @ApiModelProperty("批次号") private String batch_number; @ApiModelProperty("开始时间") diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Purchase_contract_index.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Purchase_contract_index.java index 00a5dfd..25e9931 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Purchase_contract_index.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Purchase_contract_index.java @@ -12,4 +12,5 @@ public class Purchase_contract_index { private String limit; private String ident_type="supplier"; private String ident_id; + private String contract_name; //合同名称 }