调拨

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java

@@ -64,10 +64,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
         ResultBean rb = ResultBean.fireFail();
         String brandCode = dto.getBrandCode();//品牌编码
         //查询品牌编码是否有重复的
-        int count = baseVehicleBrandService.selectCountByBrandCode(brandCode);
+        /*int count = baseVehicleBrandService.selectCountByBrandCode(brandCode);
         if (count > 0) {
             return ResultBean.fireFail().setMsg("品牌编码已存在");
-        }
+        }*/
         BaseVehicleBrand entity = new BaseVehicleBrand();
         dto.fillEntity(entity);
         boolean isSave = baseVehicleBrandService.save(entity);
@@ -86,10 +86,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
         }
         String brandCode = dto.getBrandCode();//品牌编码
         //查询品牌编码是否有重复的
-        int count = baseVehicleBrandService.selectCountByBrandCodeSid(brandCode, sid);
+        /*int count = baseVehicleBrandService.selectCountByBrandCodeSid(brandCode, sid);
         if (count > 0) {
             return ResultBean.fireFail().setMsg("品牌编码已存在");
-        }
+        }*/
         int i = baseVehicleBrandService.updateBySid(dto.toMap(), sid);
         if (i == 0) {
             return ResultBean.fireFail().setMsg("修改失败");

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -54,6 +54,22 @@ public interface SysOrganizationFeign {
     @GetMapping("/selectChildrenListBySid/{sid}")
     public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("调出一级站-调入当前一级站内所有二级站")
+    @GetMapping("/tranOne/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranOne(@PathVariable("sid") String sid);
+
+    @ApiOperation("调出一级站-调入当前分公司内所有一级站，不包含自身")
+    @GetMapping("/tranTwo/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranTwo(@PathVariable("sid") String sid);
+
+    @ApiOperation("调出一级站-本集团内调入所有一级站，不包含自身")
+    @GetMapping("/tranThree/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranThree(@PathVariable("sid") String sid);
+
+    @ApiOperation("调出二级站-调入上级一级站及站下所有二级站，不包含自身")
+    @GetMapping("/tranfour/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranfour(@PathVariable("sid") String sid);
+
     @ApiOperation("新增保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody SysOrganizationDto dto);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -54,6 +54,26 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return rb.setMsg("接口anrui_portal/sysorganization/selectChildrenListBySid无法访问");
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranOne(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranTwo(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranThree(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranfour(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean save(SysOrganizationDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/save无法访问");

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java

@@ -90,6 +90,8 @@ public class SysUserVo implements Vo {
 
     private String defaultDeptName;
     private String defaultDeptSid;
+    private String defaultOrgAttributeKey;
+    private String defaultOrgAttributeValue;
 
     @ApiModelProperty("是否需要更换密码")
     private Boolean needResetPsd;

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java

@@ -18,4 +18,7 @@ public class OrgList implements Vo {
     private String deptName;
 
     private String deptSid;
+
+    private String orgAttributeKey;
+    private String orgAttributeValue;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -130,4 +130,12 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrgStaffVo> selectByOrgDeptSid2(String orgDeptSid);
 
     List<SysOrganization> selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid);
+
+    List<SysOrganizationVo> tranOne(String sid);
+
+    List<SysOrganizationVo> tranTwo(String sid);
+
+    List<SysOrganizationVo> tranThree(String sid);
+
+    List<SysOrganizationVo> tranfour(String sid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -249,4 +249,77 @@
         where psid = #{pSid}
           and orgCode =#{orgCode}
     </select>
+
+    <select id="tranOne" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE (
+                orgAttributeKey = 'fwz_002'
+                        OR orgAttributeKey = 'fwz_003'
+                )
+          AND psid = #{sid}
+    </select>
+
+    <select id="tranTwo" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE orgAttributeKey = 'fwz_001'
+          AND (
+                psid =
+                (SELECT
+                         psid
+                 FROM
+                         sys_organization
+                 WHERE sid = #{sid})
+                        OR sid =
+                           (SELECT
+                                    psid
+                            FROM
+                                    sys_organization
+                            WHERE sid = #{sid})
+                )
+          AND sid != #{sid}
+    </select>
+
+    <select id="tranThree" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE orgAttributeKey = 'fwz_001'
+          AND sid != #{sid}
+    </select>
+
+    <select id="tranfour" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE sid =
+              (SELECT
+                       psid
+               FROM
+                       sys_organization
+               WHERE sid = #{sid})
+        UNION
+        SELECT
+                *
+        FROM
+                sys_organization
+        WHERE (
+                orgAttributeKey = 'fwz_002'
+                        OR orgAttributeKey = 'fwz_003'
+                )
+          AND psid =
+              (SELECT
+                       psid
+               FROM
+                       sys_organization
+               WHERE sid = #{sid})
+          AND sid != #{sid}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -109,6 +109,26 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.selectChildrenListBySid(sid));
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranOne(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranOne(sid));
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranTwo(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranTwo(sid));
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranThree(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranThree(sid));
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranfour(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranfour(sid));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResultBean update(SysOrganizationDto dto, String sid) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -719,4 +719,20 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     public List<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
         return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid);
     }
+
+    public List<SysOrganizationVo> tranOne(String sid) {
+        return baseMapper.tranOne(sid);
+    }
+
+    public List<SysOrganizationVo> tranTwo(String sid) {
+        return baseMapper.tranTwo(sid);
+    }
+
+    public List<SysOrganizationVo> tranThree(String sid) {
+        return baseMapper.tranThree(sid);
+    }
+
+    public List<SysOrganizationVo> tranfour(String sid) {
+        return baseMapper.tranfour(sid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java

@@ -12,28 +12,36 @@ public class WmsInventoryAlloSelectList {
 
     //sid
     private String sid;
-    //商品名称
+    //商品spuSid
+    private String goodsSpuSid;
+    //商品spu名称
     private String goodsSpuName;
-    //零件号
+    //商品skuSid
+    private String goodsSkuSid;
+    //商品sku名称
+    private String goodsSkuTitle;
+    //图号
     private String goodsSkuCode;
     //规格
     private String goodsSkuOwnSpec;
-    //车型
-    private String carModel;
+    //厂家sid
+    private String manufacturerSid;
+    //厂家名称
+    private String manufacturerName;
     //商品单位
     private String unit;
     //仓库sid
     private String warehouseSid;
     //仓库名称
     private String warehouseName;
+    //库区sid
+    private String warehouseAreasid;
+    //库区名称
+    private String warehouseArea;
     //库位sid
     private String warehouseRackSid;
     //库位编码
     private String warehouseRackCode;
-    //库位名称
-    private String areaName;
-    //含税价
-    private String taxPrice;
     //库存数量
     private String count;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -238,20 +238,27 @@
 
     <select id="alloGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAlloSelectList">
         SELECT wi.sid,
+        wi.goodsSpuSid,
         wi.goodsSpuName,
+        wi.goodsSkuSid,
+        wi.goodsSkuTitle,
         wi.goodsSkuCode,
         wi.goodsSkuOwnSpec,
+        wi.manufacturerSid,
+        wi.manufacturerName
         wi.unit,
         wi.warehouseSid,
         wi.warehouseName,
+        wa.sid AS warehouseAreasid,
+        wa.areaName AS warehouseArea,
         wi.warehouseRackSid,
         wi.warehouseRackCode,
-        wwa.areaName,
-        wi.count,
-        wi.cost as taxPrice
+        wi.count
         FROM wms_inventory wi
-        LEFT JOIN wms_warehouse_area wwa
-        ON wi.`warehouseRackSid` = wwa.`sid`
+        LEFT JOIN wms_warehouse_rack wr
+        ON wi.warehouseRackSid = wr.sid
+        LEFT JOIN wms_warehouse_area wa
+        ON wr.locationSid = wa.sid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBill.java

@@ -24,8 +24,6 @@ public class WmsInventoryAllocateBill extends BaseEntity {
     private String inPlatName;//调入站名称
     private String inOrgSid;//调入分公司sid
     private String inOrgName;//调入分公司
-    private String count;//调拨数量
-    private String amount;//调拨金额
     private String confirmSid;//确认人sid
     private String confirmName;//确认人姓名
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -40,6 +38,7 @@ public class WmsInventoryAllocateBill extends BaseEntity {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
+    private Integer grade;
     private String createOrgSid;//创建组织sid
     private String createOrgName;//创建组织名称
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java

@@ -83,10 +83,6 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo {
     private String inOrgSid;
     @ApiModelProperty("调入分公司sid")
     private String inOrgName;
-    @ApiModelProperty("调拨数量")
-    private BigDecimal count;
-    @ApiModelProperty("调拨金额")
-    private BigDecimal amount;
     @ApiModelProperty("确认人sid")
     private String confirmSid;
     @ApiModelProperty("确认人姓名")
@@ -108,6 +104,8 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
+    @ApiModelProperty("调拨等级（1一级站内，2分公司内，3集团内）")
+    private Integer grade;
     @ApiModelProperty("调拨单商品明细")
     private List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocateBillDetailNewList;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java

@@ -43,10 +43,6 @@ public class WmsInventoryAllocateBillDtoNew implements Dto {
     private String inOrgSid;
     @ApiModelProperty("调入分公司sid")
     private String inOrgName;
-    @ApiModelProperty("调拨数量")
-    private BigDecimal count;
-    @ApiModelProperty("调拨金额")
-    private BigDecimal amount;
     @ApiModelProperty("确认人sid")
     private String confirmSid;
     @ApiModelProperty("确认人姓名")
@@ -68,6 +64,8 @@ public class WmsInventoryAllocateBillDtoNew implements Dto {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
+    @ApiModelProperty("调拨等级（1一级站内，2分公司内，3集团内）")
+    private Integer grade;
     @ApiModelProperty("调拨单商品明细")
     private List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetail.java

@@ -12,32 +12,30 @@ import java.util.Date;
  */
 @Data
 public class WmsInventoryAllocateBillDetail extends BaseEntity {
-//    private String id;
-//    private String sid= UUID.randomUUID().toString();
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    private Date createTime;
-//    private String remarks;
-//    private String isEnable;
-    private String billSid;//商品ID（唯一编码，入库时生成）
-    private String inventorySid;//商品sid
-    private String goodsSid;//入库单sid
-    private String goodsName;//入库单明细sid
-    private String goodsCode;//销售价格1
-    private String specification;//销售价格2
-    private String goodsModel;//销售价格3
-    private String unit;//销售价格4
-    private String outWarehouseSid;//销售价格5
-    private String outWarehouseName;//计量单位
-    private String warehouseAreasid;//库存数量
-    private String warehouseArea;//销售底价
-    private String taxPrice;//三包价格
-    private String stockCount;//首保价格
-    private String inWarehouseSid;//仓库sid
-    private String inWarehouseName;//仓库名称
-    private String warehouseRackSid;//调入库位sid
-    private String warehouseRackCode;//调入库位编码
-    private String count;//货位
-    private String amount;//是否显示折扣标志
+
+    private String billSid;//主表sid
+    private String inventorySid;//商品库存sid
+    private String goodsID;//商品ID
+    private String goodsSpuSid;//商品spuSid
+    private String goodsSpuName;//商品spu名称
+    private String goodsSkuSid;//商品skuSid
+    private String goodsSkuTitle;//商品sku名称
+    private String goodsSkuCode;//图号
+    private String goodsSkuOwnSpec;//规格型号
+    private String manufacturerSid;//厂家sid
+    private String manufacturerName;//厂家名称
+    private String unit;//单位
+    private String warehouseSid;//仓库sid
+    private String warehouseName;//仓库名称
+    private String warehouseAreasid;//库区sid
+    private String warehouseArea;//库区名称
+    private String warehouseRackSid;//库位sid
+    private String warehouseRackCode;//库位编码
+    private String stockCount;//库存数量
+    private String markUpRatio;//加价比例(%)
+    private String requAmount;//调拔单价
+    private String count;//调拨数量
+    private String amount;//调拨金额（调拨数量*含税价）
 
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDtoNew.java

@@ -17,46 +17,50 @@ public class WmsInventoryAllocateBillDetailDtoNew implements Dto {
 
     private String sid;
 
-    @ApiModelProperty("盘点单sid")
+    @ApiModelProperty("主表sid")
     private String billSid;
     @ApiModelProperty("商品库存sid")
     private String inventorySid;
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("商品spuSid")
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+    @ApiModelProperty("单位")
+    private String unit;
     @ApiModelProperty("仓库sid")
     private String warehouseSid;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
     @ApiModelProperty("库位sid")
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
-    @ApiModelProperty("含税价")
-    private BigDecimal taxPrice;
     @ApiModelProperty("库存数量")
     private BigDecimal stockCount;
-    @ApiModelProperty("调入仓库sid")
-    private String inWarehouseSid;
-    @ApiModelProperty("调入仓库名称")
-    private String inWarehouseName;
-    @ApiModelProperty("调入库位sid")
-    private String inWarehouseRackSid;
-    @ApiModelProperty("调入库位编码")
-    private String inWarehouseRackCode;
+    @ApiModelProperty("加价比例(%)")
+    private BigDecimal markUpRatio;
+    @ApiModelProperty("调拔单价")
+    private BigDecimal requAmount;
     @ApiModelProperty("调拨数量")
     private BigDecimal count;
     @ApiModelProperty("调拨金额（调拨数量*含税价）")
     private BigDecimal amount;
-
-    /*
-     * 页面展示
-     * */
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
-    @ApiModelProperty("零件号")
-    private String goodsSkuCode;
-    @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec;
-    @ApiModelProperty("车型")
-    private String carModel;
-    @ApiModelProperty("商品单位")
-    private String unit;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java

@@ -33,14 +33,6 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
     public void insertByDto(WmsInventoryAllocateBillDetailDtoNew dto) {
         WmsInventoryAllocateBillDetail entity = new WmsInventoryAllocateBillDetail();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-        entity.setOutWarehouseSid(dto.getWarehouseSid());
-        entity.setOutWarehouseName(dto.getWarehouseName());
-        entity.setWarehouseAreasid(dto.getWarehouseRackSid());
-        entity.setWarehouseArea(dto.getWarehouseRackCode());
-        entity.setInWarehouseSid(dto.getInWarehouseSid());
-        entity.setInWarehouseName(dto.getInWarehouseName());
-        entity.setWarehouseRackSid(dto.getInWarehouseRackSid());
-        entity.setWarehouseRackCode(dto.getInWarehouseRackCode());
         baseMapper.insert(entity);
     }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocatebillDetailDetailsVoNew.java

@@ -53,46 +53,50 @@ public class WmsInventoryAllocatebillDetailDetailsVoNew implements Vo {
 
     private String sid;
 
-	@ApiModelProperty("盘点单sid")
+	@ApiModelProperty("主表sid")
     private String billSid;
 	@ApiModelProperty("商品库存sid")
     private String inventorySid;
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("商品spuSid")
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+    @ApiModelProperty("单位")
+    private String unit;
     @ApiModelProperty("仓库sid")
     private String warehouseSid;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
     @ApiModelProperty("库位sid")
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
-    @ApiModelProperty("含税价")
-    private BigDecimal taxPrice;
     @ApiModelProperty("库存数量")
     private BigDecimal stockCount;
-    @ApiModelProperty("调入仓库sid")
-    private String inWarehouseSid;
-    @ApiModelProperty("调入仓库名称")
-    private String inWarehouseName;
-    @ApiModelProperty("调入库位sid")
-    private String inWarehouseRackSid;
-    @ApiModelProperty("调入库位编码")
-    private String inWarehouseRackCode;
+    @ApiModelProperty("加价比例(%)")
+    private BigDecimal markUpRatio;
+    @ApiModelProperty("调拔单价")
+    private BigDecimal requAmount;
     @ApiModelProperty("调拨数量")
     private BigDecimal count;
     @ApiModelProperty("调拨金额（调拨数量*含税价）")
     private BigDecimal amount;
-
-    /*
-    * 页面展示
-    * */
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
-    @ApiModelProperty("零件号")
-    private String goodsSkuCode;
-    @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec;
-    @ApiModelProperty("车型")
-    private String carModel;
-    @ApiModelProperty("商品单位")
-    private String unit;
 }