Browse Source

修改维修工单选择客户

master
fanzongzhe0036 3 months ago
parent
commit
0f9cf87168
  1. 12
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
  2. 196
      yxt-as/src/main/java/com/yxt/anrui/as/feign/yxtcrm/CrmCustomer.java
  3. 8
      yxt-as/src/main/java/com/yxt/anrui/as/feign/yxtcrm/YxtCrmCustomerTempFeign.java
  4. 14
      yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java
  5. 16
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
  6. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java
  7. 42
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
  8. 86
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
  9. 68
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/report/InventoryStockListQuery.java
  10. 105
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/report/InventoryStockListVo.java

12
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@ -6,8 +6,6 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asappendix.AsAppendix;
import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
import com.yxt.anrui.as.api.asbusrepairbill.*;
import com.yxt.anrui.as.api.asbusrepairbill.app.*;
import com.yxt.anrui.as.api.asbusrepairbill.report.*;
@ -31,7 +29,6 @@ import com.yxt.anrui.as.api.utils.AsRule;
import com.yxt.anrui.as.api.utils.FileUrlQuery;
import com.yxt.anrui.as.api.utils.domain.AsBillNo;
import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
import com.yxt.anrui.as.biz.asarrearsoutapply.AsArrearsoutApplyService;
import com.yxt.anrui.as.biz.asbillsettelapply.AsBillSettelApplyService;
import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService;
@ -54,10 +51,7 @@ import com.yxt.anrui.as.feign.crm.CrmCustomerTemp;
import com.yxt.anrui.as.feign.crm.CrmCustomerTempFeign;
import com.yxt.anrui.as.feign.file.AsFileEnum;
import com.yxt.anrui.as.feign.fin.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.as.feign.fms.FmsReceivesettle;
import com.yxt.anrui.as.feign.fms.FmsReceivesettleDto;
import com.yxt.anrui.as.feign.fms.FmsReceivesettleFeign;
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
@ -69,6 +63,8 @@ import com.yxt.anrui.as.feign.sms.SmsGoods;
import com.yxt.anrui.as.feign.sms.SmsGoodsFeign;
import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryFeign;
import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryPush;
import com.yxt.anrui.as.feign.yxtcrm.CrmCustomer;
import com.yxt.anrui.as.feign.yxtcrm.YxtCrmCustomerTempFeign;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
@ -160,6 +156,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
private AsTechTitleDetailService asTechTitleDetailService;
@Autowired
private AsTrackQuestionService asTrackQuestionService;
@Autowired
private YxtCrmCustomerTempFeign yxtCrmCustomerTempFeign;
/**
* 维修领料获取派工单
@ -1277,7 +1275,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
return rb.setMsg("当前已完成竣工环节,无需提交");
}
String customerSid = dto.getCustomerSid();
CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(customerSid).getData();
CrmCustomer customerTemp = yxtCrmCustomerTempFeign.fetchEntity(customerSid).getData();
if (null != customerTemp) {
if (dto.getBillType().equals("欠款月结")) {
if (customerTemp.getIsDesignatedEnterprise().intValue() == 1) {

196
yxt-as/src/main/java/com/yxt/anrui/as/feign/yxtcrm/CrmCustomer.java

@ -0,0 +1,196 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.feign.yxtcrm;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: crm(crm) <br/>
* File: CrmCustomer.java <br/>
* Class: com.yxt.crm.api.crmcustomer.CrmCustomer <br/>
* Description: 客户. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-15 17:06:09 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "客户", description = "客户")
@TableName("crm_customer")
public class CrmCustomer extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("客户编号(部门编码+客户类型(1位,0个人,1企业)+部门内部流水号(6位))")
private String customerNo;
@ApiModelProperty("客户类型(自然人/法人)")
private String customerType;
@ApiModelProperty("客户类型key")
private String customerTypeKey;
@ApiModelProperty("客户分类(个人:司机/个体老板/其他。企业:企业型客户/一级经销商/二级经销商/终端物流客户)")
private String customerClass;
@ApiModelProperty("客户分类key")
private String customerClassKey;
@ApiModelProperty("客户来源(公司资源/自主开发/交接客户/转介绍客户/集团内销)")
private String source;
@ApiModelProperty("客户来源key")
private String sourceKey;
@ApiModelProperty("客户级别(意向客户/准客户/成交客户/集团内销/黑名单客户)")
private String level;
@ApiModelProperty("客户级别key")
private String levelKey;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("证件类型key")
private String certificateTypeKey;
@ApiModelProperty("证件类型(个人为身份证/企业为营业执照)")
private String certificateType;
@ApiModelProperty("证件号码(个人为身份证号/企业为统一社会信用代码)")
private String IDNumber;
@ApiModelProperty("证件有效期")
private String endDate;
@ApiModelProperty("行政区划代码(省)")
private String address_province;
@ApiModelProperty("行政区划代码(市)")
private String address_city;
@ApiModelProperty("行政区划代码(县)")
private String address_county;
@ApiModelProperty("省")
private String province;
@ApiModelProperty("市")
private String city;
@ApiModelProperty("县")
private String county;
@ApiModelProperty("详细地址")
private String address;
@ApiModelProperty("邮编")
private String zipCode;
@ApiModelProperty("电子邮箱")
private String e_mail;
@ApiModelProperty("联系人")
private String contacts;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("紧急联系电话")
private String emergencyContact;
@ApiModelProperty("紧急联系电话")
private String emergencyMobile;
@ApiModelProperty("微信号码")
private String weixin;
@ApiModelProperty("业务人员sid")
private String staffSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建部门sid")
private String useOrgSid;
@ApiModelProperty("性别")
private String sex;
@ApiModelProperty("性别key")
private String sexKey;
@ApiModelProperty("生日")
private String birthday;
@ApiModelProperty("所在公司名称")
private String companyName;
@ApiModelProperty("跟进状态key")
private String follow_state_key;
@ApiModelProperty("跟进状态")
private String follow_state;
@ApiModelProperty("是否开启提醒key(1开启,0不开启)")
private String isOnRemindkey;
@ApiModelProperty("是否开启提醒(1开启,0不开启)")
private String isOnRemind;
@ApiModelProperty("提醒日期")
private String remind_day;
@ApiModelProperty("提醒备注")
private String remind_remark;
@ApiModelProperty("客户头像")
private String customerPhoto;
@ApiModelProperty("见面方式key")
private String visitWayKey;
@ApiModelProperty("见面方式(到店/电话/拜访)")
private String visitWay;
@ApiModelProperty("证件地址")
private String certificateAddress;
@ApiModelProperty("是否为定点企业(1是0否)")
private Integer isDesignatedEnterprise;
@ApiModelProperty("定点企业备案有效期")
private Date filingIndate;
}

8
yxt-as/src/main/java/com/yxt/anrui/as/feign/yxtcrm/YxtCrmCustomerTempFeign.java

@ -1,7 +1,5 @@
package com.yxt.anrui.as.feign.yxtcrm;
import com.yxt.anrui.as.feign.crm.CrmCustomerTemp;
import com.yxt.anrui.as.feign.crm.CrmCustomerTempDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -33,4 +31,10 @@ public interface YxtCrmCustomerTempFeign {
@PostMapping("/saveForQuickVeh")
public ResultBean<String> saveForQuickVeh(@Valid @RequestBody CrmCustomerDto dto);
@ApiOperation("根据sid查询实体")
@GetMapping("/fetchEntity/{sid}")
@ResponseBody
public ResultBean<CrmCustomer> fetchEntity(@PathVariable("sid") String sid);
}

14
yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java

@ -29,8 +29,6 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.crm.biz.crmcustomer.*;
import com.yxt.crm.biz.crmcustomerorg.CrmCustomerOrgQuery;
import com.yxt.crm.biz.crmcustomerorg.CrmCustomerOrgVo;
import com.yxt.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -39,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: crm(crm) <br/>
@ -64,6 +61,17 @@ public class CrmCustomerRest {
@Autowired
private CrmMaintenanceenterpriseRecordService crmMaintenanceenterpriseRecordService;
@ApiOperation("根据sid查询实体")
@GetMapping("/fetchEntity/{sid}")
@ResponseBody
public ResultBean<CrmCustomer> fetchEntity(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
CrmCustomer crmCustomer = crmCustomerService.fetchBySid(sid);
return rb.success().setData(crmCustomer);
}
@ApiOperation("根据条件分页查询客户信息的列表")
@PostMapping("/customerListPage")
public ResultBean<PagerVo<CustomerVehVo>> customerListPage(@RequestBody PagerQuery<CustomerVehQuery> pq){

16
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@ -5,17 +5,13 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.inventory.wmsinventory.*;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryDto;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryQuery;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillUseOrgSidQuery;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillUseOrgSidVo;
import com.yxt.wms.biz.inventory.wmsinventory.appInventory.InventorySearchQuery;
import com.yxt.wms.biz.inventory.wmsinventory.appInventory.OldStorageVo;
import com.yxt.wms.biz.inventory.wmsinventory.appInventory.StorageVo;
import com.yxt.wms.biz.inventory.wmsinventory.report.DeadStockQuery;
import com.yxt.wms.biz.inventory.wmsinventory.report.DeadStockVo;
import com.yxt.wms.biz.inventory.wmsinventory.report.InventoryStockListQuery;
import com.yxt.wms.biz.inventory.wmsinventory.report.InventoryStockListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -308,4 +304,12 @@ public class WmsInventoryRest {
PagerVo<DeadStockVo> pv = wmsInventoryService.deadStockList(pq);
return rb.success().setData(pv);
}
@ApiOperation("库存查询")
@PostMapping("/inventoryStockList")
public ResultBean<PagerVo<InventoryStockListVo>> inventoryStockList(@RequestBody PagerQuery<InventoryStockListQuery> pq) {
ResultBean<PagerVo<InventoryStockListVo>> rb = ResultBean.fireFail();
PagerVo<InventoryStockListVo> pv = wmsInventoryService.inventoryStockList(pq);
return rb.success().setData(pv);
}
}

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

@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsListTagH5Vo;
import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTagH5Vo;
import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackH5Vo;
import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackListVo;
import com.yxt.wms.biz.inventory.wmsinventory.appInventory.OldStorageListVo;
import com.yxt.wms.biz.inventory.wmsinventory.appInventory.StorageListVo;
import com.yxt.wms.biz.inventory.wmsinventory.report.DeadStockVo;
import com.yxt.wms.biz.inventory.wmsinventory.report.InventoryStockListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -100,4 +100,6 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
List<WmsInventory> selCJByDeptSidAndRackSid(@Param("deptSid") String deptSid,@Param("rackSids") List<String> rackSids);
List<WmsInventory> selCJByDeptSid(String deptSid);
IPage<InventoryStockListVo> inventoryStockList(IPage<WmsInventory> page, @Param(Constants.WRAPPER)QueryWrapper<WmsInventory> qw);
}

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

@ -723,4 +723,46 @@
AND wwi.useOrgSid = #{deptSid}
AND wwi.warehouseTypeKey = '03'
</select>
<select id="inventoryStockList"
resultType="com.yxt.wms.biz.inventory.wmsinventory.report.InventoryStockListVo">
SELECT * FROM
(SELECT
i.goodsID,
s.orgSidPath,
so.`name` useOrgName,
s.`name` deptName,
i.goodsSpuName,
i.goodsSkuCode,
i.goodsSkuOwnSpec,
i.unit,
IFNULL(SUM(`count`),0) `count`,
IFNULL(i.cost,0) `cost`,
SUM(IFNULL(i.cost,0) * IFNULL(i.count,0)) costTotal,
(SELECT IFNULL(salesPrice,0) FROM yxt_base.base_goods_sku_extend as sku WHERE sku.sid = i.goodsSkuSid) price,
i.warehouseName,
wa.areaName wareAreaName,
i.warehouseRackCode,
i.manufacturerName,
i.supplierName,
(SELECT MIN(wi.firstInDate) FROM wms_inventory as wi WHERE wi.count > 0 and wi.useOrgSid = i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid AND wi.warehouseRackCode = i.warehouseRackCode) firstInDate,
date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as wi on r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid AND wi.warehouseRackCode = i.warehouseRackCode and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.billType = '1'),'%Y-%m-%d') storageTime, -- 最近一次入库时间
date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as wi on r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid AND wi.warehouseRackCode = i.warehouseRackCode and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.busTypeValue = '销售出库'),'%Y-%m-%d') salesTime, -- 最近一次销售日期
DATEDIFF(NOW(),date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as wi on r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid AND wi.warehouseRackCode = i.warehouseRackCode and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.billType = '1'),'%Y-%m-%d')) inventoryAge,
i.manufactorBillNo,
pb.payTypeValue procurementMethod,
pb.purchaseTypeValue,
pb.manufacturersOrderTypeValue
FROM
wms_inventory as i
LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid
LEFT JOIN anrui_portal.sys_organization as so ON i.createOrgSid = so.sid
LEFT JOIN wms_warehouse_rack as ra ON ra.sid = i.warehouseRackSid
LEFT JOIN wms_warehouse_area as wa ON wa.sid = ra.locationSid
LEFT JOIN yxt_pms.pms_purchase_bill as pb ON pb.manufacturersOrderNumber = i.manufactorBillNo
WHERE i.count > 0
GROUP BY i.goodsID,i.goodsSkuSid,i.goodsSkuCode,i.useOrgSid,i.manufacturerSid,i.supplierSid,i.warehouseRackCode,i.manufactorBillNo) m
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

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

@ -19,11 +19,8 @@ import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackListVo;
import com.yxt.wms.biz.inventory.wmsinventory.appInventory.*;
import com.yxt.wms.biz.inventory.wmsinventory.report.DeadStockQuery;
import com.yxt.wms.biz.inventory.wmsinventory.report.DeadStockVo;
import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill;
import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService;
import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBill;
import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillQuery;
import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillVo;
import com.yxt.wms.biz.inventory.wmsinventory.report.InventoryStockListQuery;
import com.yxt.wms.biz.inventory.wmsinventory.report.InventoryStockListVo;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.wms.feign.pms.PmsPurchasebackDetailFeign;
@ -34,7 +31,6 @@ import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.math.BigDecimal;
@ -1209,4 +1205,82 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
public List<WmsInventory> selCJByDeptSid(String deptSid) {
return baseMapper.selCJByDeptSid(deptSid);
}
public PagerVo<InventoryStockListVo> inventoryStockList(PagerQuery<InventoryStockListQuery> pq) {
InventoryStockListQuery query = pq.getParams();
QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(query.getMenuUrl())) {
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("m.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("m.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("m.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("m.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
// qw.eq("wsb.createBySid", query.getUserSid());
} else {
PagerVo<InventoryStockListVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<InventoryStockListVo> p = new PagerVo<>();
return p;
}
}
//ToDo:添加查询条件
if (StringUtils.isNotBlank(query.getGoodsID())) {
qw.like("m.goodsID", query.getGoodsID());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("m.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("m.goodsSpuName", query.getGoodsSpuName());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("m.manufacturerName", query.getManufacturerName());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("m.supplierName", query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("m.warehouseName", query.getWarehouseName());
}
if (StringUtils.isNotBlank(query.getWareAreaName())) {
qw.like("m.wareAreaName", query.getWareAreaName());
}
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
qw.like("m.warehouseRackCode", query.getWarehouseRackCode());
}
qw.apply(StringUtils.isNotBlank(query.getCountStart()), "m.count >= " + query.getCountStart()).
apply(StringUtils.isNotBlank(query.getCountEnd()), "m.count <= " + query.getCountEnd());
qw.apply(StringUtils.isNotBlank(query.getCostStart()), "m.cost >= " + query.getCostStart()).
apply(StringUtils.isNotBlank(query.getCostEnd()), "m.cost <= " + query.getCostEnd());
qw.apply(StringUtils.isNotBlank(query.getPriceStart()), "m.price >= " + query.getPriceStart()).
apply(StringUtils.isNotBlank(query.getPriceEnd()), "m.price <= " + query.getPriceEnd());
IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
IPage<InventoryStockListVo> pagging = baseMapper.inventoryStockList(page, qw);
PagerVo<InventoryStockListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

68
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/report/InventoryStockListQuery.java

@ -0,0 +1,68 @@
package com.yxt.wms.biz.inventory.wmsinventory.report;
import com.yxt.common.core.query.Query;
import lombok.Data;
@Data
public class InventoryStockListQuery implements Query {
/**
* 成本单价区间结束
*/
private String costEnd;
/**
* 成本单价区间开始
*/
private String costStart;
/**
* 库存数量区间结束
*/
private String countEnd;
/**
* 库存数量区间开始
*/
private String countStart;
/**
* 商品ID
*/
private String goodsID;
/**
* 图号
*/
private String goodsSkuCode;
/**
* 商品名称
*/
private String goodsSpuName;
/**
* 厂家
*/
private String manufacturerName;
private String menuUrl;
private String orgPath;
/**
* 销售价区间结束
*/
private String priceEnd;
/**
* 销售价区间开始
*/
private String priceStart;
/**
* 供应商
*/
private String supplierName;
private String userSid;
/**
* 库区
*/
private String wareAreaName;
/**
* 仓库
*/
private String warehouseName;
/**
* 库位
*/
private String warehouseRackCode;
}

105
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/report/InventoryStockListVo.java

@ -0,0 +1,105 @@
package com.yxt.wms.biz.inventory.wmsinventory.report;
import lombok.Data;
@Data
public class InventoryStockListVo {
/**
* 成本价
*/
private String cost;
/**
* 成本合计
*/
private String costTotal;
/**
* 库存数量
*/
private String count;
/**
* 门店
*/
private String deptName;
/**
* 首次入库时间
*/
private String firstInDate;
/**
* 商品ID
*/
private String goodsID;
/**
* 图号
*/
private String goodsSkuCode;
/**
* 规格
*/
private String goodsSkuOwnSpec;
/**
* 商品名称
*/
private String goodsSpuName;
/**
* 最近一次入库距当前天数
*/
private String inventoryAge;
/**
* 最近一次销售时间
*/
private String lastSalesDate;
/**
* 最近一次入库时间
*/
private String lastStorageDate;
/**
* 订单编号
*/
private String manufactorBillNo;
/**
* 厂家
*/
private String manufacturerName;
/**
* 厂家订单类型
*/
private String manufacturersOrderTypeValue;
/**
* 销售单价
*/
private String price;
/**
* 采购方式
*/
private String procurementMethod;
/**
* 采购类别
*/
private String purchaseTypeValue;
/**
* 供应商
*/
private String supplierName;
/**
* 单位
*/
private String unit;
/**
* 分公司
*/
private String useOrgName;
/**
* 库区
*/
private String wareAreaName;
/**
* 仓库
*/
private String warehouseName;
/**
* 库位
*/
private String warehouseRackCode;
}
Loading…
Cancel
Save