From 13bae36978eac0f537ba362366a050c5a611d9fe Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Thu, 6 Jul 2023 18:04:07 +0800 Subject: [PATCH] 7-6 --- .../yxt/supervise/gf/shanhai/ShRequester.java | 176 ++++++++++++++++-- .../gf/shanhai/req/In_stockExamine.java | 22 +++ .../gf/shanhai/req/In_stockExportData.java | 34 ++++ .../req/In_stockGetRecordMaterielList.java | 32 ++++ .../gf/shanhai/req/In_stockIndex.java | 35 ++++ .../{Examine.java => Out_stockExamine.java} | 2 +- ...portData.java => Out_stockExportData.java} | 2 +- .../req/Out_stockGetRecordMaterielList.java | 33 ++++ .../gf/shanhai/req/Out_stockIndex.java | 37 ++++ .../gf/shanhai/resp/InStockGetInfo.java | 74 ++++++++ .../resp/InStockGetRecordMaterielList.java | 54 ++++++ .../gf/shanhai/resp/InStockIndex.java | 62 ++++++ .../supervise/gf/shanhai/resp/OutStock.java | 62 ++++++ .../{GetInfo.java => OutStockGetInfo.java} | 2 +- .../gf/shanhai/resp/RecordMaterielList.java | 33 ++++ .../src/test/java/demo/tool/SecurTest.java | 42 ++++- 16 files changed, 680 insertions(+), 22 deletions(-) create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockExamine.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockExportData.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockIndex.java rename yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/{Examine.java => Out_stockExamine.java} (92%) rename yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/{ExportData.java => Out_stockExportData.java} (96%) create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockGetRecordMaterielList.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockIndex.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockGetInfo.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockGetRecordMaterielList.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockIndex.java create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/OutStock.java rename yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/{GetInfo.java => OutStockGetInfo.java} (98%) create mode 100644 yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/RecordMaterielList.java 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 1e25949..10f081b 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 @@ -3,10 +3,7 @@ package com.yxt.supervise.gf.shanhai; import cn.hutool.core.bean.BeanUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.yxt.supervise.gf.shanhai.req.Apply_materialIndex; -import com.yxt.supervise.gf.shanhai.req.Examine; -import com.yxt.supervise.gf.shanhai.req.ExportData; -import com.yxt.supervise.gf.shanhai.req.InventoryIndex; +import com.yxt.supervise.gf.shanhai.req.*; import com.yxt.supervise.gf.shanhai.resp.*; import java.util.HashMap; @@ -24,6 +21,15 @@ public class ShRequester { private static String out_stock$get_info = "/api/system/out_stock/get_info";//7.出库申请 出库申请详情 private static String out_stock$examine = "/api/system/out_stock/examine"; //8. 出库审核 出库审核 private static String out_stock$export_data = "/api/system/out_stock/export_data"; //9. 出库记录导出 出库记录导出 + private static String out_stock$export_bill = "/api/system/out_stock/export_bill"; //10.导出出库单 + private static String out_stock$index = "/api/system/out_stock/index"; //11.出库申请记录 + private static String out_stock$get_record_materiel_list = "/api/system/out_stock/get_record_materiel_list";// 12.出库记录列表 + private static String in_stock$get_info = "/api/system/in_stock/get_info"; //13.入库申请 入库申请详情 + private static String in_stock$export_data = "/api/system/in_stock/export_data"; //14.入库导出 + private static String in_stock$export_bill = "/api/system/in_stock/export_bill"; //15.入库单导出 + private static String in_stock$index = "/api/system/in_stock/index"; //16.入库申请 + private static String in_stock$examine = "/api/system/in_stock/examine"; //17.入库审核 + private static String in_stock$get_record_materiel_list = "/api/system/in_stock/get_record_materiel_list"; //18.入库记录 入库记录列表 /** * 1.待配货列表 * @@ -110,8 +116,8 @@ public class ShRequester { * @Param [id] * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse **/ - public static BaseResponse getApi$system$out_stock$get_info(String id){ - BaseResponse resp = new BaseResponse<>(); + public static BaseResponse getApi$system$out_stock$get_info(String id){ + BaseResponse resp = new BaseResponse<>(); Map params = new HashMap<>(); params.put("id", id); String s = ShHttp.doGet(out_stock$get_info, params); @@ -121,45 +127,185 @@ public class ShRequester { resp.setCode(Integer.parseInt(code)); resp.setMsg(msg); JSONObject data = (JSONObject)jsonObject.get("data"); - GetInfo outStock = JSONUtil.toBean(data, GetInfo.class); + OutStockGetInfo outStock = JSONUtil.toBean(data, OutStockGetInfo.class); resp.setData(outStock); return resp; } /** - * @Description //描述： 8. 出库审核 出库审核 + * @Description //描述： 8. 出库审核 出库审核 todo 暂不知参数是什么，返回值待定 * @Param [reqParams] * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse **/ - public static BaseResponse getApi$system$out_stock$examine(Examine reqParams){ - BaseResponse resp = new BaseResponse<>(); + public static BaseResponse getApi$system$out_stock$examine(Out_stockExamine reqParams){ + BaseResponse resp = new BaseResponse<>(); + BaseResponseListObj resObj = new BaseResponseListObj<>(); Map param = null; if (reqParams != null) param = BeanUtil.beanToMap(reqParams); String s = ShHttp.dopost(out_stock$examine, param); + BaseResponse baseResponse = toBean(s, resp, resObj); +// JSONObject jsonObject = JSONUtil.parseObj(s); +// String code = jsonObject.get("code").toString(); +// String msg = jsonObject.get("msg").toString(); +// JSONObject data = (JSONObject)jsonObject.get("data"); +// resp.setCode(Integer.parseInt(code)); +// resp.setMsg(msg); +// resp.setData(data); + return baseResponse; + } + + /** + * @Description //描述： 9. 出库记录导出 + * @Param [reqParams] + * @return java.lang.String + **/ + public static String getApi$system$out_stock$export_data(Out_stockExportData reqParams){ + Map param = null; + if (reqParams != null) + param = BeanUtil.beanToMap(reqParams); + String s = ShHttp.doGet(out_stock$export_data, param); + return s; + } + + /** + * @Description //描述： 10. 导出出库单 + * @Param [id] + * @return java.lang.String + **/ + public static String getApi$system$out_stock$export_bill(String id){ + Map params = new HashMap<>(); + params.put("id", id); + String s = ShHttp.doGet(out_stock$export_bill, params); + return s; + } + + /** + * @Description //描述： 11. 出库申请记录 + * @Param [reqParams] + * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse> + **/ + public static BaseResponse> getApi$system$out_stock$index(Out_stockIndex reqParams){ + BaseResponse> resp = new BaseResponse<>(); + BaseResponseListObj respObj = new BaseResponseListObj<>(); + Map param = null; + if (reqParams != null) + param = BeanUtil.beanToMap(reqParams); + String s = ShHttp.doGet(out_stock$index, param); + BaseResponse> baseResponse = toBean(s, resp, respObj); + return baseResponse; + } + + /** + * @Description //描述： 12. 出库记录列表 出库导出 + * @Param [reqParams] + * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse> + **/ + public static BaseResponse> getApi$system$out_stock$get_record_materiel_list(Out_stockGetRecordMaterielList reqParams){ + BaseResponse> req = new BaseResponse<>(); + BaseResponseListObj reqObj = new BaseResponseListObj<>(); + Map param = null; + if (reqParams != null) + param = BeanUtil.beanToMap(reqParams); + String s = ShHttp.doGet(out_stock$get_record_materiel_list, param); + BaseResponse> baseResponse = toBean(s, req, reqObj); + return baseResponse; + } + + /** + * @Description //描述： 13. 入库申请 + * @Param [id] + * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse + **/ + public static BaseResponse getApi$system$in_stock$get_info(String id){ + BaseResponse resp = new BaseResponse<>(); + Map params = new HashMap<>(); + params.put("id", id); + String s = ShHttp.doGet(in_stock$get_info, params); JSONObject jsonObject = JSONUtil.parseObj(s); String code = jsonObject.get("code").toString(); String msg = jsonObject.get("msg").toString(); - JSONObject data = (JSONObject)jsonObject.get("data"); resp.setCode(Integer.parseInt(code)); resp.setMsg(msg); - resp.setData(data); + JSONObject data = (JSONObject)jsonObject.get("data"); + InStockGetInfo outStock = JSONUtil.toBean(data, InStockGetInfo.class); + resp.setData(outStock); return resp; } /** - * @Description //描述： 9. 出库记录导出 + * @Description //描述： 14. 入库导出 * @Param [reqParams] * @return java.lang.String **/ - public static String getApi$system$out_stock$export_data(ExportData reqParams){ + public static String getApi$system$in_stock$export_data(In_stockExportData reqParams){ Map param = null; if (reqParams != null) param = BeanUtil.beanToMap(reqParams); - String s = ShHttp.doGet(out_stock$export_data, param); + String s = ShHttp.doGet(in_stock$export_data, param); + return s; + } + + /** + * @Description //描述： 15. 入库单导出 + * @Param [id] + * @return java.lang.String + **/ + public static String getApi$system$in_stock$export_bill(String id){ + Map params = new HashMap<>(); + params.put("id", id); + String s = ShHttp.doGet(in_stock$export_bill, params); return s; } + /** + * @Description //描述： 16. 入库申请 + * @Param [reqParams] + * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse> + **/ + public static BaseResponse> getApi$system$in_stock$index(In_stockIndex reqParams){ + BaseResponse> req = new BaseResponse<>(); + BaseResponseListObj reqObj = new BaseResponseListObj<>(); + Map param = null; + if (reqParams != null) + param = BeanUtil.beanToMap(reqParams); + String s = ShHttp.doGet(in_stock$index, param); + BaseResponse> baseResponse = toBean(s, req, reqObj); + return baseResponse; + } + + /** + * @Description //描述： 17. 入库审核 todo 暂不知参数是什么，返回值待定 + * @Param [reqParams] + * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse + **/ + public static BaseResponse getApi$system$in_stock$examine(In_stockExamine reqParams){ + BaseResponse resp = new BaseResponse<>(); + BaseResponseListObj resObj = new BaseResponseListObj<>(); + Map param = null; + if (reqParams != null) + param = BeanUtil.beanToMap(reqParams); + String s = ShHttp.doGet(in_stock$examine, param); + BaseResponse baseResponse = toBean(s, resp, resObj); + return baseResponse; + } + + /** + * @Description //描述： 18. 入库记录 入库记录列表 + * @Param [reqParams] + * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse> + **/ + public static BaseResponse> getApi$system$in_stock$get_record_materiel_list(In_stockGetRecordMaterielList reqParams){ + BaseResponse> req = new BaseResponse<>(); + BaseResponseListObj reqObj = new BaseResponseListObj<>(); + Map param = null; + if (reqParams != null) + param = BeanUtil.beanToMap(reqParams); + String s = ShHttp.doGet(in_stock$get_record_materiel_list, param); + BaseResponse> baseResponse = toBean(s, req, reqObj); + return baseResponse; + } + /** * @Description //描述： 将Json格式数据封装成统一返回对象 * @Param [s, resp, respObj] diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockExamine.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockExamine.java new file mode 100644 index 0000000..f766fcf --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockExamine.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.gf.shanhai.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-06-17:17 + */ +@Data +@ApiModel(value = "入库审核") +public class In_stockExamine { + @ApiModelProperty("记录id") + private String id; + @ApiModelProperty("审核次数") + private String examine; + @ApiModelProperty("审核状态") + private String status; + @ApiModelProperty("备注") + private String remark; +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockExportData.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockExportData.java new file mode 100644 index 0000000..bf83ff9 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockExportData.java @@ -0,0 +1,34 @@ +package com.yxt.supervise.gf.shanhai.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import sun.management.resources.agent; + +/** + * @author feikefei + * @create 2023-07-06-14:50 + */ +@Data +@ApiModel(value = "入库导出") +public class In_stockExportData { + @ApiModelProperty("入库开始时间") + private String start_happen_time; + @ApiModelProperty("入库结束时间") + private String end_happen_time; + @ApiModelProperty("批次号") + private String batch_number; + @ApiModelProperty("物料编号") + private String materiel_no; + @ApiModelProperty("物料名称") + private String materiel_name; + @ApiModelProperty("入库类型") + private String type; + @ApiModelProperty("入库仓库") + private String inp_storehouse_id; + @ApiModelProperty("来源id") + private String target_id; + @ApiModelProperty("来源类型") + private String target_type; + +} 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 new file mode 100644 index 0000000..7faa842 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java @@ -0,0 +1,32 @@ +package com.yxt.supervise.gf.shanhai.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-06-17:33 + */ +@Data +@ApiModel(value = "入库记录",description = "入库记录列表") +public class In_stockGetRecordMaterielList { + @ApiModelProperty("仓库id") + private String storehouse_id; + @ApiModelProperty("批次号") + private String batch_number; + @ApiModelProperty("开始时间") + private String start_happen_time; + @ApiModelProperty("解决时间") + private String end_happen_time; + @ApiModelProperty("物料编码") + private String materiel_no; + @ApiModelProperty("物料名称") + private String materiel_name; + @ApiModelProperty("类型") + private String type; + @ApiModelProperty("目标id") + private String target_id; + @ApiModelProperty("目标类型") + private String target_type; +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockIndex.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockIndex.java new file mode 100644 index 0000000..fdcec1c --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockIndex.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.gf.shanhai.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-06-15:02 + */ +@Data +@ApiModel(value = "入库申请") +public class In_stockIndex { + @ApiModelProperty("入库仓库id") + private String storehouse_id; + @ApiModelProperty("批次号") + private String batch_number; + @ApiModelProperty("入库类型（参考入库类型接口）") + private String type; + @ApiModelProperty("发生时间") + private String happen_time; + @ApiModelProperty("目标id") + private String target_id; + @ApiModelProperty("目标类型") + private String target_type; + @ApiModelProperty("审核人id") + private String admin_id; + @ApiModelProperty("审核时间") + private String opinion_time; + @ApiModelProperty("审核状态 1为审核通过，2为审核拒绝，0为待审核") + private String status; + @ApiModelProperty("审核级别 1为初审核，2为复审 ，0为无需审核") + private String current_examine; + +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Examine.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockExamine.java similarity index 92% rename from yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Examine.java rename to yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockExamine.java index 7267e16..0cf31f9 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Examine.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockExamine.java @@ -9,7 +9,7 @@ import lombok.Data; */ @Data @ApiModel(value = "出库审核", description = "出库审核") -public class Examine { +public class Out_stockExamine { private Integer id;//申请id private String examine;//审核次数 private String status;//审核状态 diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/ExportData.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockExportData.java similarity index 96% rename from yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/ExportData.java rename to yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockExportData.java index 3b09eee..16c2f64 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/ExportData.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockExportData.java @@ -10,7 +10,7 @@ import lombok.Data; */ @Data @ApiModel(value = "出库记录导出") -public class ExportData { +public class Out_stockExportData { @ApiModelProperty("出库开始时间") private String start_happen_time; @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 new file mode 100644 index 0000000..95cece5 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockGetRecordMaterielList.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.gf.shanhai.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-06-9:19 + */ +@Data +@ApiModel(value = "出库记录列表",description = "出库导出") +public class Out_stockGetRecordMaterielList { + @ApiModelProperty("仓库id") + private String storehouse_id; + @ApiModelProperty("批次号") + private String batch_number; + @ApiModelProperty("开始时间") + private String start_happen_time; + @ApiModelProperty("解决时间") + private String end_happen_time; + @ApiModelProperty("物料编码") + private String materiel_no; + @ApiModelProperty("物料名称") + private String materiel_name; + @ApiModelProperty("类型") + private String type; + @ApiModelProperty("目标id") + private String target_id; + @ApiModelProperty("目标类型") + private String target_type; + +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockIndex.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockIndex.java new file mode 100644 index 0000000..2bb42a7 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockIndex.java @@ -0,0 +1,37 @@ +package com.yxt.supervise.gf.shanhai.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import sun.management.resources.agent; + +/** + * @author feikefei + * @create 2023-07-06-8:58 + */ +@Data +@ApiModel(value = "出库申请记录") +public class Out_stockIndex { + @ApiModelProperty("出库仓库id") + private Integer storehouse_id; + @ApiModelProperty("批次号") + private String batch_number; + @ApiModelProperty("出库类型") + private Integer type; + @ApiModelProperty("发生时间") + private String happen_time; + @ApiModelProperty("目标id") + private Integer target_id; + @ApiModelProperty("目前类型（agent=代理商类型，agent_stock=代理商库存，customer=用户，storehouse=仓库，supplier=供应商） 目标id不为空时此项必填写") + private String target_type; + @ApiModelProperty("审核人id") + private Integer admin_id; + @ApiModelProperty("审核时间") + private String opinion_time; + @ApiModelProperty("审核状态1为审核通过，2为审核拒绝，0为待审核") + private Integer status; + @ApiModelProperty("审核级别1为初审核，2为复审 ，0为无需审核") + private Integer current_examine; + + +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockGetInfo.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockGetInfo.java new file mode 100644 index 0000000..a312242 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockGetInfo.java @@ -0,0 +1,74 @@ +package com.yxt.supervise.gf.shanhai.resp; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author feikefei + * @create 2023-07-06-10:17 + */ +@Data +@ApiModel(value = "入库申请",description = "入库申请详情") +public class InStockGetInfo { + @ApiModelProperty("申请id") + private String id; + @ApiModelProperty("") + private String contract_no; + @ApiModelProperty("入库id") + private String storehouse_id; + @ApiModelProperty("仓库名称") + private String storehouse_name; + @ApiModelProperty("批次编号") + private String batch_number; + @ApiModelProperty("入库类型") + private String type; + @ApiModelProperty("入库类型明文") + private String type_text; + @ApiModelProperty("单价") + private String price; + @ApiModelProperty("") + private String actual_price; + @ApiModelProperty("入库时间") + private String happen_time; + @ApiModelProperty("审核人名称") + private String admin_name; + @ApiModelProperty("") + private String apply_customer_name; + @ApiModelProperty("") + private String agent_name; + @ApiModelProperty("") + private String agent_id; + @ApiModelProperty("") + private String apply_id; + @ApiModelProperty("") + private String target_id; + @ApiModelProperty("") + private String target_type; + @ApiModelProperty("创建时间") + private String create_time; + @ApiModelProperty("审核状态") + private String status; + @ApiModelProperty("审核状态明文") + private String status_text; + @ApiModelProperty("审核时间") + private String opinion_time; + @ApiModelProperty("关联批次号") + private String link_batch_number; + @ApiModelProperty("备注") + private String note; + @ApiModelProperty("审核次数") + private String examine; + @ApiModelProperty("当前审核次数") + private String current_examine; + @ApiModelProperty("物料信息") + private List maeriel; + @ApiModelProperty("附件文件") + private File file; + @ApiModelProperty("") + private List auth; + @ApiModelProperty("") + private String [] materiel_group_list; +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockGetRecordMaterielList.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockGetRecordMaterielList.java new file mode 100644 index 0000000..52e3ff9 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockGetRecordMaterielList.java @@ -0,0 +1,54 @@ +package com.yxt.supervise.gf.shanhai.resp; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-06-17:38 + */ +@Data +@ApiModel(value = "入库记录",description = "入库记录列表") +public class InStockGetRecordMaterielList { + @ApiModelProperty("物料名称") + private String materiel_name; + @ApiModelProperty("品牌") + private String brand_name; + @ApiModelProperty("物料编号") + private String materiel_no; + @ApiModelProperty("批次号") + private String batch_number; + @ApiModelProperty("物料组") + private String materiel_group_text; + @ApiModelProperty("本次操作数量") + private String num; + @ApiModelProperty("单价") + private String price; + @ApiModelProperty("批次总金额") + private String actual_price; + @ApiModelProperty("物料单位") + private String unit; + @ApiModelProperty("经办人") + private String admin_name; + @ApiModelProperty("仓库名称") + private String storehouse_name; + @ApiModelProperty("申请时间") + private String happen_time; + @ApiModelProperty("类型") + private String type; + @ApiModelProperty("类型明文") + private String type_text; + @ApiModelProperty("审核状态") + private String status; + @ApiModelProperty("原数量") + private String orig_num; + @ApiModelProperty("更新后的数量") + private String new_num; + @ApiModelProperty("创建时间") + private String create_time; + @ApiModelProperty("来源名称") + private String source_name; + @ApiModelProperty("来源类型") + private String source_type; +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockIndex.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockIndex.java new file mode 100644 index 0000000..ad3ab11 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/InStockIndex.java @@ -0,0 +1,62 @@ +package com.yxt.supervise.gf.shanhai.resp; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-06-15:08 + */ +@Data +@ApiModel(value = "入库申请") +public class InStockIndex { + @ApiModelProperty("审核记录id") + private String id;//11121, + @ApiModelProperty("") + private String contract_no;//"HXDQ0602", + @ApiModelProperty("入库仓库id") + private String storehouse_id;//20, + @ApiModelProperty("入库仓库名称") + private String storehouse_name;//"庄河荣名库", + @ApiModelProperty("批次号") + private String batch_number;//"2023060200001", + @ApiModelProperty("入库类型") + private String type;//10, + @ApiModelProperty("入库类型明文") + private String type_text;//"采购入库", + @ApiModelProperty("单价") + private String price;//"92000.00", + @ApiModelProperty("") + private String actual_price;//"92000.00", + @ApiModelProperty("发生时间") + private String happen_time;//"2023-06-02 00:00:00", + @ApiModelProperty("操作人姓名") + private String admin_name;//"马彦平", + @ApiModelProperty("供应商名称") + private String supplier_name;//"河北豪鑫电气科技有限公司", + @ApiModelProperty("供应商id") + private String supplier_id;//10011, + @ApiModelProperty("") + private String target_id;//10011, + @ApiModelProperty("") + private String target_type;//"supplier", + @ApiModelProperty("创建记录时间") + private String create_time;//"2023-06-02 17:09:50", + @ApiModelProperty("审核状态") + private String status;//1, + @ApiModelProperty("审核状态明文") + private String status_text;//"审核通过", + @ApiModelProperty("审核时间") + private String opinion_time;//"2023-06-02 17:13:40", + @ApiModelProperty("关联批次号") + private String link_batch_number;//"", + @ApiModelProperty("备注") + private String note;//"", + @ApiModelProperty("审核次数") + private String examine;//1, + @ApiModelProperty("当前审核次数") + private String current_examine;//1, + @ApiModelProperty("") + private String link_list;//null +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/OutStock.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/OutStock.java new file mode 100644 index 0000000..a9ab90d --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/OutStock.java @@ -0,0 +1,62 @@ +package com.yxt.supervise.gf.shanhai.resp; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-06-9:06 + */ +@Data +@ApiModel(value = "出库申请记录") +public class OutStock { + @ApiModelProperty("审核记录id") + private String id;//11130, + @ApiModelProperty("") + private String contract_no;//"", + @ApiModelProperty("入库仓库id") + private String storehouse_id;//15, + @ApiModelProperty("入库仓库名称") + private String storehouse_name;//"安阳荣名库", + @ApiModelProperty("批次号") + private String batch_number;//"2023060500007", + @ApiModelProperty("入库类型") + private String type;//220, + @ApiModelProperty("入库类型明文") + private String type_text;//"调拨出库", + @ApiModelProperty("单价") + private String price;//"54920.00", + @ApiModelProperty("") + private String actual_price;//"54920.00", + @ApiModelProperty("发生时间") + private String happen_time;//"2023-06-05 11:57:26", + @ApiModelProperty("操作人姓名") + private String admin_name;//"罗雪珂", + @ApiModelProperty("") + private String agent_name;//"【安阳整县】河北冀朋工程项目管理有限公司", + @ApiModelProperty("") + private String agent_id;//89, + @ApiModelProperty("") + private String target_id;//89, + @ApiModelProperty("") + private String target_type;//"agent_stock", + @ApiModelProperty("创建记录时间") + private String create_time;//"2023-06-05 11:59:18", + @ApiModelProperty("审核状态") + private String status;//1, + @ApiModelProperty("状态明文") + private String status_text;//"审核通过", + @ApiModelProperty("审核时间") + private String opinion_time;//"2023-06-05 11:59:35", + @ApiModelProperty("关联批次号") + private String link_batch_number;//"", + @ApiModelProperty("备注") + private String note;//"", + @ApiModelProperty("审核次数") + private String examine;//1, + @ApiModelProperty("当前审核次数") + private String current_examine;//1, + @ApiModelProperty("") + private String link_list;//null +} diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/GetInfo.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/OutStockGetInfo.java similarity index 98% rename from yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/GetInfo.java rename to yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/OutStockGetInfo.java index f5a609c..ca1da6c 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/GetInfo.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/OutStockGetInfo.java @@ -12,7 +12,7 @@ import java.util.List; */ @Data @ApiModel(value = "出库申请",description = "出库申请详情") -public class GetInfo { +public class OutStockGetInfo { @ApiModelProperty("申请id") private String id;// array @ApiModelProperty("入库id") diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/RecordMaterielList.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/RecordMaterielList.java new file mode 100644 index 0000000..d13e3d1 --- /dev/null +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/RecordMaterielList.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.gf.shanhai.resp; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-07-06-9:25 + */ +@Data +@ApiModel(value = "出库记录列表") +public class RecordMaterielList { + private String materiel_name;//"逆变器-40", + private String brand_name;//"山海新能-锦浪", + private String materiel_no;//"2001000040", + private String batch_number;//"2023060500007", + private String materiel_group_text;//"逆变器", + private String num;//2, + private String price;//"8690.00", + private String actual_price;//"54920.00", + private String unit;//"个", + private String admin_name;//"罗雪珂", + private String storehouse_name;//"安阳荣名库", + private String happen_time;//"2023-06-05 11:57:26", + private String type;//220, + private String type_text;//"调拨出库", + private String status;//"审核通过", + private String orig_num;//0, + private String new_num;//2, + private String create_time;//"2023-06-05 11:59:18", + private String source_name;//"【安阳整县】河北冀朋工程项目管理有限公司", + private String source_type;//"代理商仓库" +} diff --git a/yxt-supervise-gf-biz/src/test/java/demo/tool/SecurTest.java b/yxt-supervise-gf-biz/src/test/java/demo/tool/SecurTest.java index 065aad8..b2078b5 100644 --- a/yxt-supervise-gf-biz/src/test/java/demo/tool/SecurTest.java +++ b/yxt-supervise-gf-biz/src/test/java/demo/tool/SecurTest.java @@ -7,9 +7,11 @@ import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; import cn.hutool.http.HttpRequest; import com.yxt.supervise.gf.shanhai.ShRequester; -import com.yxt.supervise.gf.shanhai.req.Examine; +import com.yxt.supervise.gf.shanhai.req.In_stockExamine; import com.yxt.supervise.gf.shanhai.resp.BaseResponse; -import com.yxt.supervise.gf.shanhai.resp.GetInfo; +import com.yxt.supervise.gf.shanhai.resp.BaseResponseListObj; +import com.yxt.supervise.gf.shanhai.resp.InStockGetRecordMaterielList; +import com.yxt.supervise.gf.shanhai.resp.InStockIndex; import org.junit.Test; import sun.misc.BASE64Decoder; @@ -100,8 +102,40 @@ public class SecurTest { // BaseResponse api$system$out_stock$examine = ShRequester.getApi$system$out_stock$examine(examine); // System.out.println(api$system$out_stock$examine); - String api$system$out_stock$export_data = ShRequester.getApi$system$out_stock$export_data(null); - System.out.println(api$system$out_stock$export_data); +// String api$system$out_stock$export_data = ShRequester.getApi$system$out_stock$export_data(null); +// System.out.println(api$system$out_stock$export_data); + +// String api$system$out_stock$export_bill = ShRequester.getApi$system$out_stock$export_bill("10888"); +// System.out.println(api$system$out_stock$export_bill); + +// BaseResponse> api$system$out_stock$index = ShRequester.getApi$system$out_stock$index(null); +// System.out.println(api$system$out_stock$index); + +// BaseResponse> api$system$out_stock$get_record_materiel_list = ShRequester.getApi$system$out_stock$get_record_materiel_list(null); +// System.out.println(api$system$out_stock$get_record_materiel_list); + +// BaseResponse api$system$in_stock$get_info = ShRequester.getApi$system$in_stock$get_info("10888"); +// System.out.println(api$system$in_stock$get_info); + +// String api$system$in_stock$export_data = ShRequester.getApi$system$in_stock$export_data(null); +// System.out.println(api$system$in_stock$export_data); + +// String api$system$in_stock$export_bill = ShRequester.getApi$system$in_stock$export_bill("10888"); +// System.out.println(api$system$in_stock$export_bill); + +// BaseResponse> api$system$in_stock$index = ShRequester.getApi$system$in_stock$index(null); +// System.out.println(api$system$in_stock$index); + +// In_stockExamine in_stockExamine = new In_stockExamine(); +// in_stockExamine.setId("11109"); +// in_stockExamine.setExamine("1"); +// in_stockExamine.setRemark("备注"); +// in_stockExamine.setStatus("1"); +// BaseResponse api$system$in_stock$examine = ShRequester.getApi$system$in_stock$examine(in_stockExamine); +// System.out.println(api$system$in_stock$examine); + + BaseResponse> api$system$in_stock$get_record_materiel_list = ShRequester.getApi$system$in_stock$get_record_materiel_list(null); + System.out.println(api$system$in_stock$get_record_materiel_list); } /**