登录、出入库等查询接口

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/instock/InStockRest.java

@@ -15,6 +15,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+
 
 /**
  * @author feikefei
@@ -53,6 +55,26 @@ public class InStockRest {
     public ResultBean getInStockInfo(@PathVariable String id){
         ResultBean rb = ResultBean.fireFail();
         BaseResponse<InStockGetInfo> api$system$in_stock$get_info = ShRequester.getApi$system$in_stock$get_info(id);
+        String[] bill = api$system$in_stock$get_info.getData().getFile().getBill();
+        String[] ding = api$system$in_stock$get_info.getData().getFile().getDing();
+        String[] voucher = api$system$in_stock$get_info.getData().getFile().getVoucher();
+        String[] contract_pic = api$system$in_stock$get_info.getData().getFile().getContract_pic();
+        String[] billUrlImage = ShRequester.getUrlImage(bill);
+        String[] dingUrlImage = ShRequester.getUrlImage(ding);
+        String[] voucherUrlImage = ShRequester.getUrlImage(voucher);
+        String[] contractPicUrlImage = ShRequester.getUrlImage(contract_pic);
+        api$system$in_stock$get_info.getData().getFile().setBill(billUrlImage);
+        api$system$in_stock$get_info.getData().getFile().setDing(dingUrlImage);
+        api$system$in_stock$get_info.getData().getFile().setVoucher(voucherUrlImage);
+        api$system$in_stock$get_info.getData().getFile().setContract_pic(contractPicUrlImage);
         return rb.success().setData(api$system$in_stock$get_info);
     }
+
+    @PostMapping("/getInStockMaterielList")
+    @ApiOperation(value = "获取入库记录列表")
+    public ResultBean getInStockMaterielList(In_stockGetRecordMaterielList in_stockGetRecordMaterielList){
+        ResultBean rb = ResultBean.fireFail();
+        BaseResponse<BaseResponseListObj<InStockGetRecordMaterielList>> 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);
+    }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryRest.java

@@ -5,13 +5,18 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.gf.api.inventory.InventoryQuery;
 import com.yxt.supervise.gf.api.inventory.InventoryVo;
+import com.yxt.supervise.gf.shanhai.ShRequester;
 import com.yxt.supervise.gf.shanhai.req.InventoryIndex;
+import com.yxt.supervise.gf.shanhai.resp.BaseResponse;
+import com.yxt.supervise.gf.shanhai.resp.BaseResponseListObj;
+import com.yxt.supervise.gf.shanhai.resp.Inventory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * @author feikefei
@@ -44,4 +49,12 @@ public class InventoryRest {
     public void export(@PathVariable String storehouse_name, HttpServletResponse response) throws Exception{
         inventoryService.export(storehouse_name, response);
     }
+
+    @PostMapping("/getInventoryList")
+    @ApiOperation(value = "查询库存管理列表")
+    public ResultBean getInventoryList(@RequestBody InventoryIndex map){
+        ResultBean rb = ResultBean.fireFail();
+        BaseResponse<BaseResponseListObj<Inventory>> api$system$inventory$index = ShRequester.getApi$system$inventory$index(map);
+        return rb.success().setData(api$system$inventory$index);
+    }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/materialbrand/MaterialBrandRest.java

@@ -6,10 +6,7 @@ import com.yxt.supervise.gf.shanhai.resp.BaseResponse;
 import com.yxt.supervise.gf.shanhai.resp.BaseResponseListObj;
 import com.yxt.supervise.gf.shanhai.resp.MaterialBrandIndex;
 import io.swagger.annotations.Api;
-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.Map;
 
@@ -28,4 +25,11 @@ public class MaterialBrandRest {
         BaseResponse<BaseResponseListObj<MaterialBrandIndex>> api$api$system$material_brand$index = ShRequester.getApi$api$system$material_brand$index(map);
         return rb.success().setData(api$api$system$material_brand$index);
     }
+
+    @GetMapping("/getMaterialGroup")
+    public ResultBean getMaterialGroup(){
+        ResultBean rb = ResultBean.fireFail();
+        BaseResponse apiSystemMaterielGetMaterielGroup = ShRequester.getApiSystemMaterielGetMaterielGroup();
+        return rb.success().setData(apiSystemMaterielGetMaterielGroup);
+    }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockRest.java

@@ -8,10 +8,7 @@ import com.yxt.supervise.gf.api.outstock.OutStockVo;
 import com.yxt.supervise.gf.shanhai.ShRequester;
 import com.yxt.supervise.gf.shanhai.req.Out_stockGetRecordMaterielList;
 import com.yxt.supervise.gf.shanhai.req.Out_stockIndex;
-import com.yxt.supervise.gf.shanhai.resp.BaseResponse;
-import com.yxt.supervise.gf.shanhai.resp.BaseResponseListObj;
-import com.yxt.supervise.gf.shanhai.resp.OutStock;
-import com.yxt.supervise.gf.shanhai.resp.OutStockGetInfo;
+import com.yxt.supervise.gf.shanhai.resp.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +40,7 @@ public class OutStockRest {
 
     @PostMapping("/getOutStock")
     @ApiOperation(value = "出库申请记录")
-    public ResultBean getOutStock(Out_stockIndex out_stockIndex){
+    public ResultBean getOutStock(@RequestBody Out_stockIndex out_stockIndex){
         ResultBean rb = ResultBean.fireFail();
         BaseResponse<BaseResponseListObj<OutStock>> api$system$out_stock$index = ShRequester.getApi$system$out_stock$index(out_stockIndex);
         return rb.success().setData(api$system$out_stock$index);
@@ -54,6 +51,26 @@ public class OutStockRest {
     public ResultBean getOutStockInfo(@PathVariable String id){
         ResultBean rb = ResultBean.fireFail();
         BaseResponse<OutStockGetInfo> api$system$out_stock$get_info = ShRequester.getApi$system$out_stock$get_info(id);
+        String[] bill = api$system$out_stock$get_info.getData().getFile().getBill();
+        String[] ding = api$system$out_stock$get_info.getData().getFile().getDing();
+        String[] voucher = api$system$out_stock$get_info.getData().getFile().getVoucher();
+        String[] contract_pic = api$system$out_stock$get_info.getData().getFile().getContract_pic();
+        String[] billUrlImage = ShRequester.getUrlImage(bill);
+        String[] dingUrlImage = ShRequester.getUrlImage(ding);
+        String[] voucherUrlImage = ShRequester.getUrlImage(voucher);
+        String[] contractPicUrlImage = ShRequester.getUrlImage(contract_pic);
+        api$system$out_stock$get_info.getData().getFile().setBill(billUrlImage);
+        api$system$out_stock$get_info.getData().getFile().setDing(dingUrlImage);
+        api$system$out_stock$get_info.getData().getFile().setVoucher(voucherUrlImage);
+        api$system$out_stock$get_info.getData().getFile().setContract_pic(contractPicUrlImage);
         return rb.success().setData(api$system$out_stock$get_info);
     }
+
+    @PostMapping("/getOutStockMaterielList")
+    @ApiOperation(value = "获取出库记录列表")
+    public ResultBean getOutStockMaterielList(@RequestBody Out_stockGetRecordMaterielList out_stockGetRecordMaterielList){
+        ResultBean rb = ResultBean.fireFail();
+        BaseResponse<BaseResponseListObj<RecordMaterielList>> 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);
+    }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/purchasecontract/PurchaseContractRest.java

@@ -0,0 +1,38 @@
+package com.yxt.supervise.gf.biz.purchasecontract;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.gf.shanhai.ShRequester;
+import com.yxt.supervise.gf.shanhai.req.Purchase_contract_index;
+import com.yxt.supervise.gf.shanhai.resp.BaseResponse;
+import com.yxt.supervise.gf.shanhai.resp.BaseResponseListObj;
+import com.yxt.supervise.gf.shanhai.resp.PurchaseContractIndex;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author feikefei
+ * @create 2023-09-04-9:08
+ */
+@Api(value = "出入库合同管理")
+@RestController
+@RequestMapping("gf/purchaseContract")
+public class PurchaseContractRest {
+
+    @PostMapping("/getPurchaseContractList")
+    @ApiOperation(value = "获取出入库合同管理列表")
+    public ResultBean getPurchaseContractList(@RequestBody Purchase_contract_index map){
+        ResultBean rb = ResultBean.fireFail();
+        BaseResponse<BaseResponseListObj<PurchaseContractIndex>> api$system$purchase_contract$index = ShRequester.getApi$system$purchase_contract$index(map);
+        return rb.success().setData(api$system$purchase_contract$index);
+    }
+
+    @GetMapping("/getContract")
+    @ApiOperation(value = "查看合同返回url")
+    public ResultBean getContract(@Param("pic") String pic){
+        ResultBean rb = ResultBean.fireFail();
+        String url = "https://img.shanhainengyuan.com/" + pic;
+        return rb.success().setData(url);
+    }
+}

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/stockrecordindex/StockRecordIndexRest.java

@@ -18,7 +18,7 @@ import java.util.Map;
  * @author feikefei
  * @create 2023-09-02-16:50
  */
-@Api(value = "出入库记录")
+@Api(value = "出入库记录、预付款仓库")
 @RestController
 @RequestMapping("gf/stockRecord")
 public class StockRecordIndexRest {
@@ -27,7 +27,15 @@ public class StockRecordIndexRest {
     @ApiOperation(value = "查询出入库记录")
     public ResultBean getStockRecordList(@RequestBody Map<String, Object> map){
         ResultBean rb = ResultBean.fireFail();
-        BaseResponse<BaseResponseListObj<StockRecordIndex>> api$system$stock_record$index = ShRequester.getApi$system$stock_record$index(null, map);
+        BaseResponse<BaseResponseListObj<StockRecordIndex>> api$system$stock_record$index = ShRequester.getApi$system$stock_record$index(null,map);
+        return rb.success().setData(api$system$stock_record$index);
+    }
+
+    @PostMapping("/getStockRecordListY")
+    @ApiOperation(value = "查询预付款仓库列表")
+    public ResultBean getStockRecordListY(@RequestBody Map<String, Object> map){
+        ResultBean rb = ResultBean.fireFail();
+        BaseResponse<BaseResponseListObj<StockRecordIndex>> api$system$stock_record$index = ShRequester.getApi$system$stock_record$indexY(map);
         return rb.success().setData(api$system$stock_record$index);
     }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenu/CyfSysMenuMapper.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenu/GfSysMenuMapper.java

@@ -29,7 +29,7 @@ import java.util.List;
  * @since 1.0
  */
 @Mapper
-public interface CyfSysMenuMapper extends BaseMapper<SysMenu> {
+public interface GfSysMenuMapper extends BaseMapper<SysMenu> {
 
 	//@Update("update sys_menu set name=#{msg} where id=#{id}")
 	//IPage<SysMenuVo> voPage(IPage<SysMenu> page, @Param(Constants.WRAPPER) QueryWrapper<SysMenu> qw);

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenu/CyfSysMenuMapper.xml → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenu/GfSysMenuMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.gf.biz.sysmenu.CyfSysMenuMapper">
+<mapper namespace="com.yxt.supervise.gf.biz.sysmenu.GfSysMenuMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.gf.api.sysmenu.SysMenuVo">

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenu/CyfSysMenuRest.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenu/GfSysMenuRest.java

@@ -7,11 +7,11 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.gf.api.sysmenu.*;
 import com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleQuery;
 import com.yxt.supervise.gf.api.sysuserrole.SysUserRoleVo;
-import com.yxt.supervise.gf.biz.sysmenurole.CyfSysMenuRoleService;
-import com.yxt.supervise.gf.biz.sysrole.CyfSysRoleService;
-import com.yxt.supervise.gf.biz.syssourcemenu.CyfSysSourceMenuService;
-import com.yxt.supervise.gf.biz.sysuser.CyfSysUserService;
-import com.yxt.supervise.gf.biz.sysuserrole.CyfSysUserRoleService;
+import com.yxt.supervise.gf.biz.sysmenurole.GfSysMenuRoleService;
+import com.yxt.supervise.gf.biz.sysrole.GfSysRoleService;
+import com.yxt.supervise.gf.biz.syssourcemenu.GfSysSourceMenuService;
+import com.yxt.supervise.gf.biz.sysuser.GfSysUserService;
+import com.yxt.supervise.gf.biz.sysuserrole.GfSysUserRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,20 +37,20 @@ import java.util.stream.Collectors;
  */
 @Api(tags = "菜单表")
 @RestController
-@RequestMapping("cyf/sysmenu")
-public class CyfSysMenuRest {
+@RequestMapping("gf/sysmenu")
+public class GfSysMenuRest {
     @Autowired
-    private CyfSysSourceMenuService sysSourceMenuService;
+    private GfSysSourceMenuService sysSourceMenuService;
     @Autowired
-    private CyfSysMenuService sysMenuService;
+    private GfSysMenuService sysMenuService;
     @Autowired
-    private CyfSysUserRoleService sysUserRoleService;
+    private GfSysUserRoleService sysUserRoleService;
     @Autowired
-    private CyfSysMenuRoleService sysMenuRoleService;
+    private GfSysMenuRoleService sysMenuRoleService;
     @Autowired
-    private CyfSysUserService sysUserService;
+    private GfSysUserService sysUserService;
     @Autowired
-    private CyfSysRoleService sysRoleService;
+    private GfSysRoleService sysRoleService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenu/CyfSysMenuService.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenu/GfSysMenuService.java

@@ -10,7 +10,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.gf.api.sysmenu.*;
 import com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleVo;
 import com.yxt.supervise.gf.api.syssourcemenu.SysSourceMenu;
-import com.yxt.supervise.gf.biz.syssourcemenu.CyfSysSourceMenuService;
+import com.yxt.supervise.gf.biz.syssourcemenu.GfSysSourceMenuService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,11 +35,11 @@ import java.util.stream.Collectors;
  * @since 1.0
  */
 @Service
-public class CyfSysMenuService extends MybatisBaseService<CyfSysMenuMapper, SysMenu> {
+public class GfSysMenuService extends MybatisBaseService<GfSysMenuMapper, SysMenu> {
     @Autowired
-    private CyfSysSourceMenuService sysSourceMenuService;
+    private GfSysSourceMenuService sysSourceMenuService;
     @Autowired
-    private CyfSysMenuService sysMenuService;
+    private GfSysMenuService sysMenuService;
 
     public PagerVo<SysMenu> listPage(PagerQuery<SysMenuQuery> pq) {
         SysMenuQuery query = pq.getParams();

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenurole/CyfSysMenuRoleMapper.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenurole/GfSysMenuRoleMapper.java

@@ -29,7 +29,7 @@ import java.util.List;
  * @since 1.0
  */
 @Mapper
-public interface CyfSysMenuRoleMapper extends BaseMapper<SysMenuRole> {
+public interface GfSysMenuRoleMapper extends BaseMapper<SysMenuRole> {
 
     //@Update("update sys_menu_role set name=#{msg} where id=#{id}")
     //IPage<SysMenuRoleVo> voPage(IPage<SysMenuRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysMenuRole> qw);

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenurole/CyfSysMenuRoleMapper.xml → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenurole/GfSysMenuRoleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.gf.biz.sysmenurole.CyfSysMenuRoleMapper">
+<mapper namespace="com.yxt.supervise.gf.biz.sysmenurole.GfSysMenuRoleMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleVo">

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenurole/CyfSysMenuRoleRest.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenurole/GfSysMenuRoleRest.java

@@ -9,7 +9,7 @@ import com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleDto;
 import com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleQuery;
 import com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleVo;
 import com.yxt.supervise.gf.api.sysrole.SysRole;
-import com.yxt.supervise.gf.biz.sysrole.CyfSysRoleService;
+import com.yxt.supervise.gf.biz.sysrole.GfSysRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,13 +33,13 @@ import java.util.List;
  */
 @Api(tags = "菜单与角色关联表")
 @RestController
-@RequestMapping("cyf/sysmenurole")
-public class CyfSysMenuRoleRest  {
+@RequestMapping("gf/sysmenurole")
+public class GfSysMenuRoleRest {
 
 	@Autowired
-	private CyfSysMenuRoleService sysMenuRoleService;
+	private GfSysMenuRoleService sysMenuRoleService;
 	@Autowired
-	private CyfSysRoleService sysRoleService;
+	private GfSysRoleService sysRoleService;
 
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenurole/CyfSysMenuRoleService.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysmenurole/GfSysMenuRoleService.java

@@ -11,7 +11,7 @@ import com.yxt.supervise.gf.api.sysmenurole.SysMenuRole;
 import com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleDto;
 import com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleQuery;
 import com.yxt.supervise.gf.api.sysmenurole.SysMenuRoleVo;
-import com.yxt.supervise.gf.biz.sysmenu.CyfSysMenuService;
+import com.yxt.supervise.gf.biz.sysmenu.GfSysMenuService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,9 +34,9 @@ import java.util.Map;
  * @since 1.0
  */
 @Service
-public class CyfSysMenuRoleService extends MybatisBaseService<CyfSysMenuRoleMapper, SysMenuRole> {
+public class GfSysMenuRoleService extends MybatisBaseService<GfSysMenuRoleMapper, SysMenuRole> {
     @Autowired
-    private CyfSysMenuService sysMenuService;
+    private GfSysMenuService sysMenuService;
 
     public PagerVo<SysMenuRole> listPage(PagerQuery<SysMenuRoleQuery> pq) {
         SysMenuRoleQuery query = pq.getParams();

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysrole/CyfSysRoleMapper.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysrole/GfSysRoleMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @date 2023/6/8 14:06
  */
 @Mapper
-public interface CyfSysRoleMapper extends BaseMapper<SysRole> {
+public interface GfSysRoleMapper extends BaseMapper<SysRole> {
     //@Update("update sys_role set name=#{msg} where id=#{id}")
     //IPage<SysRoleVo> voPage(IPage<SysRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysRole> qw);
     @Select("select * from sys_role s left join sys_user_role r on r.roleSid = s.sid  where r.userSid=#{sid}")

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysrole/CyfSysRoleMapper.xml → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysrole/GfSysRoleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.gf.biz.sysrole.CyfSysRoleMapper">
+<mapper namespace="com.yxt.supervise.gf.biz.sysrole.GfSysRoleMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysrole/CyfSysRoleRest.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysrole/GfSysRoleRest.java

@@ -21,10 +21,10 @@ import java.util.List;
  */
 @Api(tags = "角色")
 @RestController
-@RequestMapping("cyf/sysrole")
-public class CyfSysRoleRest {
+@RequestMapping("gf/sysrole")
+public class GfSysRoleRest {
     @Autowired
-    private CyfSysRoleService sysRoleService;
+    private GfSysRoleService sysRoleService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysrole/CyfSysRoleService.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysrole/GfSysRoleService.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @date 2023/6/8 14:07
  */
 @Service
-public class CyfSysRoleService extends MybatisBaseService<CyfSysRoleMapper, SysRole> {
+public class GfSysRoleService extends MybatisBaseService<GfSysRoleMapper, SysRole> {
 
     public List<SysRoleVo> roleVoList(String sid){
         return baseMapper.roleList(sid);

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/syssourcemenu/CyfSysSourceMenuMapper.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/syssourcemenu/GfSysSourceMenuMapper.java

@@ -30,7 +30,7 @@ import java.util.List;
  * @since 1.0
  */
 @Mapper
-public interface CyfSysSourceMenuMapper extends BaseMapper<SysSourceMenu> {
+public interface GfSysSourceMenuMapper extends BaseMapper<SysSourceMenu> {
 
     //@Update("update sys_menu_role set name=#{msg} where id=#{id}")
     //IPage<SysMenuRoleVo> voPage(IPage<SysMenuRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysMenuRole> qw);

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/syssourcemenu/CyfSysSourceMenuMapper.xml → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/syssourcemenu/GfSysSourceMenuMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.gf.biz.syssourcemenu.CyfSysSourceMenuMapper">
+<mapper namespace="com.yxt.supervise.gf.biz.syssourcemenu.GfSysSourceMenuMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.gf.api.syssourcemenu.SysSourceMenuVo">

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/syssourcemenu/CyfSysSourceMenuRest.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/syssourcemenu/GfSysSourceMenuRest.java

@@ -29,11 +29,11 @@ import java.util.List;
  */
 @Api(tags = "菜单与资源关联表")
 @RestController
-@RequestMapping("cyf/syssourcemenu")
-public class CyfSysSourceMenuRest {
+@RequestMapping("gf/syssourcemenu")
+public class GfSysSourceMenuRest {
 
 	@Autowired
-	private CyfSysSourceMenuService sysSourceMenuService;
+	private GfSysSourceMenuService sysSourceMenuService;
 
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/syssourcemenu/CyfSysSourceMenuService.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/syssourcemenu/GfSysSourceMenuService.java

@@ -32,7 +32,7 @@ import java.util.List;
  * @since 1.0
  */
 @Service
-public class CyfSysSourceMenuService extends MybatisBaseService<CyfSysSourceMenuMapper, SysSourceMenu> {
+public class GfSysSourceMenuService extends MybatisBaseService<GfSysSourceMenuMapper, SysSourceMenu> {
 	public PagerVo<SysSourceMenu> listPage(PagerQuery<SysSourceMenuQuery> pq) {
 		SysSourceMenuQuery query = pq.getParams();
 		QueryWrapper<SysSourceMenu> qw = createQueryWrapper(query);

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuser/CyfSysUserMapper.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuser/GfSysUserMapper.java

@@ -20,7 +20,7 @@ import java.util.Map;
  * @date 2023/5/4 14:37
  */
 @Mapper
-public interface CyfSysUserMapper extends BaseMapper<SysUser> {
+public interface GfSysUserMapper extends BaseMapper<SysUser> {
     @Select("select count(userName) as userName from sys_user where userName=#{userName} and password=#{password}")
     SysUserVo getUser(@Param("userName")String userName, @Param("password")String password);
     @Select("SELECT\n" +

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuser/CyfSysUserMapper.xml → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuser/GfSysUserMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.gf.biz.sysuser.CyfSysUserMapper">
+<mapper namespace="com.yxt.supervise.gf.biz.sysuser.GfSysUserMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 <!--    <select id="selectPageVo" resultType="com.yxt.supervise.gf.api.sysuser.SysUserVo">-->

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuser/CyfSysUserRest.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuser/GfSysUserRest.java

@@ -26,10 +26,10 @@ import java.util.Map;
 @Api(tags = "用户")
 @RestController
 @RequestMapping("gf/sys")
-public class CyfSysUserRest {
+public class GfSysUserRest {
 
     @Autowired
-    CyfSysUserService sysUserService;
+    GfSysUserService sysUserService;
     @Autowired
     private RedisUtil redisUtil;
 

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuser/CyfSysUserService.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuser/GfSysUserService.java

@@ -1,7 +1,6 @@
 package com.yxt.supervise.gf.biz.sysuser;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.config.RedisUtil;
@@ -14,7 +13,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.gf.api.sysrole.SysRoleVo;
 import com.yxt.supervise.gf.api.sysuser.*;
-import com.yxt.supervise.gf.biz.sysrole.CyfSysRoleService;
+import com.yxt.supervise.gf.biz.sysrole.GfSysRoleService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,7 +32,7 @@ import static java.util.concurrent.Executors.newScheduledThreadPool;
  * @date 2023/5/4 14:37
  */
 @Service
-public class CyfSysUserService extends MybatisBaseService<CyfSysUserMapper, SysUser> {
+public class GfSysUserService extends MybatisBaseService<GfSysUserMapper, SysUser> {
 
     /**
      * 设置redis的过期时间为4小时
@@ -61,7 +60,7 @@ public class CyfSysUserService extends MybatisBaseService<CyfSysUserMapper, SysU
     @Autowired
     private ImageUploadUtil imageUploadUtil;
     @Autowired
-    private CyfSysRoleService sysRoleService;
+    private GfSysRoleService sysRoleService;
 
     public SysUserVo getUser(String userName, String password) {
         ResultBean rb = new ResultBean();

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuserrole/CyfSysUserRoleMapper.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuserrole/GfSysUserRoleMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2023/6/8 14:42
  */
 @Mapper
-public interface CyfSysUserRoleMapper extends BaseMapper<SysUserRole> {
+public interface GfSysUserRoleMapper extends BaseMapper<SysUserRole> {
 
     //@Update("update sys_user_role set name=#{msg} where id=#{id}")
     //IPage<SysUserRoleVo> voPage(IPage<SysUserRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysUserRole> qw);

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuserrole/CyfSysUserRoleMapper.xml → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuserrole/GfSysUserRoleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.gf.biz.sysuserrole.CyfSysUserRoleMapper">
+<mapper namespace="com.yxt.supervise.gf.biz.sysuserrole.GfSysUserRoleMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.gf.api.sysuserrole.SysUserRoleVo">

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuserrole/CyfSysUserRoleRest.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuserrole/GfSysUserRoleRest.java

@@ -21,11 +21,11 @@ import java.util.List;
  */
 @Api(tags = "角色")
 @RestController
-@RequestMapping("cyf/sysuserrole")
-public class CyfSysUserRoleRest {
+@RequestMapping("gf/sysuserrole")
+public class GfSysUserRoleRest {
 
     @Autowired
-    private CyfSysUserRoleService sysUserRoleService;
+    private GfSysUserRoleService sysUserRoleService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuserrole/CyfSysUserRoleService.java → yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/sysuserrole/GfSysUserRoleService.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @date 2023/6/8 14:43
  */
 @Service
-public class CyfSysUserRoleService extends MybatisBaseService<CyfSysUserRoleMapper, SysUserRole> {
+public class GfSysUserRoleService extends MybatisBaseService<GfSysUserRoleMapper, SysUserRole> {
     public PagerVo<SysUserRole> listPage(PagerQuery<SysUserRoleQuery> pq) {
         SysUserRoleQuery query = pq.getParams();
         QueryWrapper<SysUserRole> qw = createQueryWrapper(query);

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/warehouseinformation/WarehouseInformationRest.java

@@ -30,10 +30,10 @@ public class WarehouseInformationRest {
         return warehouseInformationService.selectWarehouseInformation();
     }
 
-        @PostMapping("/getWarehouse")
+    @PostMapping("/getWarehouse")
     public ResultBean getWarehouse(@RequestBody Map<String, Object> map){
         ResultBean rb = ResultBean.fireFail();
-        BaseResponse<BaseResponseListObj<StorehouseIndex>> api$system$storehouse$index = ShRequester.getApi$system$storehouse$index(null    , null, map);
+        BaseResponse<BaseResponseListObj<StorehouseIndex>> api$system$storehouse$index = ShRequester.getApi$system$storehouse$index(null, null, map);
         return rb.success().setData(api$system$storehouse$index);
     }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/config/SaTokenConfigure.java

@@ -14,11 +14,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 public class SaTokenConfigure implements WebMvcConfigurer {
 
     // 注册 Sa-Token 拦截器
-//    @Override
-//    public void addInterceptors(InterceptorRegistry registry) {
-//        // 注册 Sa-Token 拦截器，校验规则为 StpUtil.checkLogin() 登录校验。
-//        registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
-//                .addPathPatterns("/**")
-//                .excludePathPatterns("/gf/sys/doLogin");
-//    }
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 注册 Sa-Token 拦截器，校验规则为 StpUtil.checkLogin() 登录校验。
+        registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
+                .addPathPatterns("/**")
+                .excludePathPatterns("/gf/sys/doLogin");
+    }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/ShRequester.java

@@ -31,7 +31,7 @@ public class ShRequester {
     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.入库记录 入库记录列表
-    private static String stock_record$index = "/api/system/stock_record/index"; //19.出入库记录 出入库记录列表
+    private static String stock_record$index = "/api/system/stock_record/index"; //19.出入库记录 storehouse_type为0 出入库记录列表  预付款仓库url一致storehouse_type为1
     private static String purchase_contract$get_info = "/api/system/purchase_contract/get_info"; //20.出入库合同详情
     private static String storehouse$index = "/api/system/storehouse/index"; //22.仓库列表
     private static String supplier$index = "/api/system/supplier/index"; //23.获取供应商 供应商列表
@@ -39,6 +39,7 @@ public class ShRequester {
     private static String purchase_contract$index = "/api/system/purchase_contract/index"; //24.查看合同
     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.获取物料组
     /**
      * 1.待配货列表
      *
@@ -52,7 +53,6 @@ public class ShRequester {
         BaseResponseListObj<ApplyMaterial> respObj = new BaseResponseListObj<>();
         String s = ShHttp.doGet(apply_material$index, param);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, resp, respObj);
-        BeanUtil.copyProperties(baseResponse,resp);
         List<JSONObject> list = baseResponse.getData().getList();
         List<ApplyMaterial> applyMaterials = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -77,7 +77,6 @@ public class ShRequester {
         params.put("id", id);
         String s = ShHttp.doGet(apply_material$get_actual_order_material, params);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, resp, respObj);
-        BeanUtil.copyProperties(baseResponse,resp);
         List<JSONObject> list = baseResponse.getData().getList();
         List<ActualOrderMaterial> actualOrderMaterials = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -99,7 +98,6 @@ public class ShRequester {
         BaseResponseListObj respObj = new BaseResponseListObj<>();
         String s = ShHttp.doGet(stock_record$get_material_stat, null);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, resp, respObj);
-        BeanUtil.copyProperties(baseResponse,resp);
         List<JSONObject> list = baseResponse.getData().getList();
         if (list == null){
             respObj.setList(null);
@@ -143,16 +141,16 @@ public class ShRequester {
     **/
     public static BaseResponse<BaseResponseListObj<Inventory>> getApi$system$inventory$index(InventoryIndex reqParams){
         Map<String, Object> param = new HashMap<>();
-        if (reqParams != null){
+        if (reqParams.getPage() != null){
             param = BeanUtil.beanToMap(reqParams);
+        }else {
+            param.put("page",1);
+            param.put("limit",2000);
         }
-        param.put("page",1);
-        param.put("limit",2000);
         BaseResponse<BaseResponseListObj<Inventory>> resp = new BaseResponse<>();
         BaseResponseListObj<Inventory> respObj = new BaseResponseListObj<>();
         String s = ShHttp.doGet(inventory$index, param);
         BaseResponse<BaseResponseListObj<JSONObject>> response = toBean(s, resp, respObj);
-        BeanUtil.copyProperties(response,resp);
         List<JSONObject> list = response.getData().getList();
         List<Inventory> inventories = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -246,7 +244,6 @@ public class ShRequester {
             param = BeanUtil.beanToMap(reqParams);
         String s = ShHttp.doGet(out_stock$index, param);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, resp, respObj);
-        BeanUtil.copyProperties(baseResponse,resp);
         List<JSONObject> list = baseResponse.getData().getList();
         List<OutStock> outStocks = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -267,14 +264,14 @@ public class ShRequester {
         BaseResponse<BaseResponseListObj<RecordMaterielList>> req = new BaseResponse<>();
         BaseResponseListObj<RecordMaterielList> reqObj = new BaseResponseListObj<>();
         Map<String, Object> param = new HashMap<>();
-        if (reqParams != null){
+        if (reqParams.getPage() != null){
             param = BeanUtil.beanToMap(reqParams);
+        }else {
+            param.put("page",1);
+            param.put("limit",2000);
         }
-        param.put("page",1);
-        param.put("limit",2000);
         String s = ShHttp.doGet(out_stock$get_record_materiel_list, param);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<RecordMaterielList> recordMaterielLists = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -345,7 +342,6 @@ public class ShRequester {
             param = BeanUtil.beanToMap(reqParams);
         String s = ShHttp.doGet(in_stock$index, param);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<InStockIndex> inStockIndices = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -382,14 +378,14 @@ public class ShRequester {
         BaseResponse<BaseResponseListObj<InStockGetRecordMaterielList>> req = new BaseResponse<>();
         BaseResponseListObj<InStockGetRecordMaterielList> reqObj = new BaseResponseListObj<>();
         Map<String, Object> param = new HashMap<>();
-        if (reqParams != null){
+        if (reqParams.getPage() != null){
             param = BeanUtil.beanToMap(reqParams);
+        }else {
+            param.put("page",1);
+            param.put("limit",2000);
         }
-        param.put("page",1);
-        param.put("limit",2000);
         String s = ShHttp.doGet(in_stock$get_record_materiel_list, param);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<InStockGetRecordMaterielList> inStockGetRecordMaterielLists = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -410,9 +406,9 @@ public class ShRequester {
         BaseResponse<BaseResponseListObj<StockRecordIndex>> req = new BaseResponse<>();
         BaseResponseListObj<StockRecordIndex> reqObj = new BaseResponseListObj<>();
         params.put("record_type", record_type);
+        params.put("storehouse_type", 0);
         String s = ShHttp.doGet(stock_record$index, params);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<StockRecordIndex> stockRecordIndices = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -447,10 +443,26 @@ public class ShRequester {
     }
     
     /**
-     * @Description //描述： 21.	预付款仓库 todo 此url跟19.出入库记录一样
-     * @Param
-     * @return
+     * @Description //描述： 21.	预付款仓库 此url跟19.出入库记录一样 根据storehouse_type来判断是否预付款仓库
+     * @Param [params]
+     * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse<com.yxt.supervise.gf.shanhai.resp.BaseResponseListObj<com.yxt.supervise.gf.shanhai.resp.StockRecordIndex>>
     **/
+    public static BaseResponse<BaseResponseListObj<StockRecordIndex>> getApi$system$stock_record$indexY(Map<String, Object> params){
+        BaseResponse<BaseResponseListObj<StockRecordIndex>> req = new BaseResponse<>();
+        BaseResponseListObj<StockRecordIndex> reqObj = new BaseResponseListObj<>();
+        params.put("storehouse_type", 1);
+        String s = ShHttp.doGet(stock_record$index, params);
+        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
+        List<JSONObject> list = baseResponse.getData().getList();
+        List<StockRecordIndex> stockRecordIndices = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            StockRecordIndex stockRecordIndex = JSONUtil.toBean(jsonObject, StockRecordIndex.class);
+            stockRecordIndices.add(stockRecordIndex);
+        }
+        reqObj.setList(stockRecordIndices);
+        req.setData(reqObj);
+        return req;
+    }
 
     /**
      * @Description //描述： 22.	仓库列表
@@ -464,7 +476,6 @@ public class ShRequester {
         map.put("storehouse_name", storehouse_name);
         String s = ShHttp.doGet(storehouse$index, map);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<StorehouseIndex> storehouseIndices = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -486,7 +497,6 @@ public class ShRequester {
         BaseResponseListObj<SupplierIndex> reqObj = new BaseResponseListObj<>();
         String s = ShHttp.doGet(supplier$index, map);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<SupplierIndex> supplierIndices = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -512,7 +522,6 @@ public class ShRequester {
         }
         String s = ShHttp.doGet(purchase_contract$index, param);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<PurchaseContractIndex> purchaseContractIndices = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -534,7 +543,6 @@ public class ShRequester {
         BaseResponseListObj<MaterialBrandIndex> reqObj = new BaseResponseListObj<>();
         String s = ShHttp.doGet(material_brand$index, param);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<MaterialBrandIndex> materialBrandIndices = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -556,7 +564,6 @@ public class ShRequester {
         BaseResponseListObj<MaterielIndex> reqObj = new BaseResponseListObj<>();
         String s = ShHttp.doGet(materiel$index, param);
         BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, req, reqObj);
-        BeanUtil.copyProperties(baseResponse,req);
         List<JSONObject> list = baseResponse.getData().getList();
         List<MaterielIndex> materielIndices = new ArrayList<>();
         for (JSONObject jsonObject : list) {
@@ -568,6 +575,25 @@ public class ShRequester {
         return req;
     }
 
+    /**
+     * @Description //描述： 27. 获取物料组
+     * @Param []
+     * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse
+    **/
+    public static BaseResponse getApiSystemMaterielGetMaterielGroup(){
+        BaseResponse resp = new BaseResponse<>();
+        String s = ShHttp.doGet(materiel$get_materiel_group, 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]
@@ -594,4 +620,21 @@ public class ShRequester {
         }
         return resp;
     }
+
+    /**
+     * @Description //描述： 拼接url
+     * @Param [image]
+     * @return java.lang.String[]
+    **/
+    public static String[] getUrlImage(String[] image){
+        String url = "https://img.shanhainengyuan.com/";
+        if (image != null){
+            System.out.println(image.length);
+            for (int i = 0; i < image.length; i++) {
+                image[i] = url + image[i];
+            }
+            return image;
+        }
+        return image;
+    }
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/In_stockGetRecordMaterielList.java

@@ -29,4 +29,6 @@ public class In_stockGetRecordMaterielList {
     private String target_id;
     @ApiModelProperty("目标类型")
     private String target_type;
+    private String page;
+    private String limit;
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/InventoryIndex.java

@@ -17,5 +17,6 @@ public class InventoryIndex {
     private String materiel_name;
     @ApiModelProperty("仓库名称")
     private String storehouse_name;
-
+    private String page;
+    private String limit;
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockGetRecordMaterielList.java

@@ -29,5 +29,7 @@ public class Out_stockGetRecordMaterielList {
     private String target_id;
     @ApiModelProperty("目标类型")
     private String target_type;
+    private String page;
+    private String limit;
 
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/req/Out_stockIndex.java

@@ -32,8 +32,6 @@ public class Out_stockIndex {
     private Integer status;
     @ApiModelProperty("审核级别1为初审核，2为复审 ，0为无需审核")
     private Integer current_examine;
-    @ApiModelProperty
     private String page;
-    @ApiModelProperty
     private String limit;
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/File.java

@@ -16,11 +16,13 @@ public class File {
     @ApiModelProperty("其他附件")
     private String inventory_record_id;//10888,
     @ApiModelProperty("合同id")
-    private String voucher;//null,
-    @ApiModelProperty("钉钉审批图片")
+    private String[] voucher;//null,
+    @ApiModelProperty("钉钉审批图片id")
     private String contract_id;//0,
+    @ApiModelProperty("钉钉审批图片")
+    private String[] contract_pic;
     @ApiModelProperty("出货单/供货单")
-    private String ding;//null,
+    private String[] ding;//null,
     @ApiModelProperty("合同图片")
     private String[] bill;
     @ApiModelProperty("创建时间")

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/shanhai/resp/OutStockGetInfo.java

@@ -50,7 +50,7 @@ public class OutStockGetInfo {
     @ApiModelProperty("物料信息")
     private List<Materiel> maeriel;
     @ApiModelProperty("附件文件")
-    private List<File> file;
+    private File file;
     @ApiModelProperty("")
     private List<Auth> auth;