yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

售后菜单增加待办数显示

master
fanzongzhe0036 3 months ago
parent
059c6f7ed2
commit
85c73e83f2
16 changed files with 290 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
  2. 37
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java
  3. 28
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/as/AsBusrepairBillFeign.java
  4. 12
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/as/AsToDoNumQuery.java
  5. 25
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsShelfBillFeign.java
  6. 12
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsToDoNumQuery.java
  7. 12
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/AsToDoNumQuery.java
  8. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
  9. 70
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
  10. 16
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
  11. 28
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
  12. 27
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java
  13. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java
  14. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml
  15. 11
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
  16. 12
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsToDoNumQuery.java

8
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
View File

@ -15,10 +15,9 @@ public class AppIndexEnum {
* 供应链
*/
GYL("98ff0724-5df4-4fc7-ab6d-3996e7706acd", "供应链"),
YW("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028", "业务"),
FK("fec4e243-491a-11ec-94cd-fa163e0cb33c", "风控");
FK("fec4e243-491a-11ec-94cd-fa163e0cb33c", "风控"),
SH("fea6ee02-05cc-11ef-9a84-8032536963eb", "售后服务");
/**
* code值
*/
@ -55,6 +54,9 @@ public class AppIndexEnum {
JFKC("a204a3fa-c8ac-4795-966c-df1d0e131bcf", "家访考察"),
FKZLSC("65dc12e0-9213-4364-ae81-18afa9c7e1ee", "放款资料上传"),
DYBL("ab7df5a0-9708-48b1-b58a-60d7e024d0a2", "抵押办理"),
WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕-售后"),
SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架-售后"),
PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收-售后"),
;
/**

37
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java
View File

@ -17,6 +17,10 @@ import com.yxt.anrui.portal.biz.sysmobilemenu.SysMobileMenuService;
import com.yxt.anrui.portal.biz.sysmobilemenurole.SysMobileMenuRoleService;
import com.yxt.anrui.portal.biz.sysuser.SysUserService;
import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
import com.yxt.anrui.portal.fegin.as.AsBusrepairBillFeign;
import com.yxt.anrui.portal.fegin.as.AsToDoNumQuery;
import com.yxt.anrui.portal.fegin.wms.WmsShelfBillFeign;
import com.yxt.anrui.portal.fegin.wms.WmsToDoNumQuery;
import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
@ -27,12 +31,12 @@ import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign;
import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.LoanHomeVisitInvestigateFeign;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -74,6 +78,11 @@ public class AppIndexService {
private LoanFileexamineFeign loanFileexamineFeign;
@Autowired
private LoanMortgageInformationTransactFeign loanMortgageInformationTransactFeign;
@Resource
private WmsShelfBillFeign wmsShelfBillFeign;
@Resource
private AsBusrepairBillFeign asBusrepairBillFeign;
public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid, String orgPath) {
ResultBean<List<AppIndexNewVo>> rb = ResultBean.fireFail();
if (StringUtils.isBlank(userSid) || StringUtils.isBlank(appSid)) {
@ -135,9 +144,13 @@ public class AppIndexService {
CommonToDoNumQuery commonToDoNumQuery = new CommonToDoNumQuery();
BusToDoNumQuery busToDoNumQuery = new BusToDoNumQuery();
RiskToDoNumQuery riskToDoNumQuery = new RiskToDoNumQuery();
WmsToDoNumQuery wmsToDoNumQuery = new WmsToDoNumQuery();
AsToDoNumQuery asToDoNumQuery = new AsToDoNumQuery();
BeanUtil.copyProperties(appToDoNumQuery, commonToDoNumQuery);
BeanUtil.copyProperties(appToDoNumQuery, busToDoNumQuery);
BeanUtil.copyProperties(appToDoNumQuery, riskToDoNumQuery);
BeanUtil.copyProperties(appToDoNumQuery, wmsToDoNumQuery);
BeanUtil.copyProperties(appToDoNumQuery, asToDoNumQuery);
//根据appSid查询菜单的信息
List<SysMobileMenu> sysMobileMenus = sysMobileMenuService.getMenu(appSid);
List<AppIndexNumVo> list = new ArrayList<>();
@ -217,6 +230,28 @@ public class AppIndexService {
}
list.add(appIndexNumVo);
}
}else if (AppIndexEnum.AppVersionSubAppSid.SH.getCode().equals(appSid)){
//售后服务
for (SysMobileMenu menu : sysMobileMenus) {
AppIndexNumVo appIndexNumVo = new AppIndexNumVo();
appIndexNumVo.setSid(menu.getSid());
//商品上架
if (AppIndexEnum.AppMenu.SPSJ.getRemarks().equals(menu.getTitle())) {
String num = wmsShelfBillFeign.getToDoNum(wmsToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//配件接收
if (AppIndexEnum.AppMenu.PJJS.getRemarks().equals(menu.getTitle())) {
String num = asBusrepairBillFeign.getToDoNum(asToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
//维修完毕
if (AppIndexEnum.AppMenu.WXWB.getRemarks().equals(menu.getTitle())) {
String num = asBusrepairBillFeign.getToDoNum2(asToDoNumQuery).getData();
appIndexNumVo.setNum(num);
}
list.add(appIndexNumVo);
}
}
return rb.success().setData(list);

28
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/as/AsBusrepairBillFeign.java
View File

@ -0,0 +1,28 @@
package com.yxt.anrui.portal.fegin.as;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* @description:
* @author: dimengzhe
* @date: 2024/3/20
**/
@FeignClient(
contextId = "yxt-as-AsBusrepairBill",
name = "yxt-as",
path = "v1/AsBusrepairBill")
public interface AsBusrepairBillFeign {
@ApiOperation("手机端-查询本分公司下代办数量:切换机构")
@GetMapping("/getToDoNum")
@ResponseBody
ResultBean<String> getToDoNum(@SpringQueryMap AsToDoNumQuery asToDoNumQuery);
@ApiOperation("手机端-查询本分公司下代办数量:切换机构")
@GetMapping("/getToDoNum2")
@ResponseBody
ResultBean<String> getToDoNum2(@SpringQueryMap AsToDoNumQuery asToDoNumQuery);
}

12
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/as/AsToDoNumQuery.java
View File

@ -0,0 +1,12 @@
package com.yxt.anrui.portal.fegin.as;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AsToDoNumQuery {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
}

25
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsShelfBillFeign.java
View File

@ -0,0 +1,25 @@
package com.yxt.anrui.portal.fegin.wms;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* @description: 售后商品上架
* @author: fzz
* @date: 2024/3/7
**/
@FeignClient(
contextId = "yxt-wms-WmsShelfBill",
name = "yxt-wms",
path = "/apiadmin/WmsShelfBill"
)
public interface WmsShelfBillFeign {
@ApiOperation("手机端-查询本分公司下代办数量:切换机构")
@GetMapping("/getToDoNum")
@ResponseBody
ResultBean<String> getToDoNum(@SpringQueryMap WmsToDoNumQuery wmsToDoNumQuery);
}

12
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsToDoNumQuery.java
View File

@ -0,0 +1,12 @@
package com.yxt.anrui.portal.fegin.wms;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class WmsToDoNumQuery {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
}

12
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/AsToDoNumQuery.java
View File

@ -0,0 +1,12 @@
package com.yxt.anrui.as.api.asbusrepairbill.app;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AsToDoNumQuery {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
}

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
View File

@ -81,4 +81,8 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
@Update("update as_busrepair_bill set manuReportNo = #{manuReportNo},reportFirstDate = #{reportFirstDate} where sid = #{sid}")
void updateManuReportNo(@Param("sid") String sid, @Param("manuReportNo") String manuReportNo, @Param("reportFirstDate") String reportFirstDate);
int getToDoNum(@Param("userSid") String userSid);
int getToDoNum2(@Param("useOrgSid") String useOrgSid);
}

70
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
View File

@ -242,6 +242,19 @@
</where>
GROUP BY i.sourceBillSid
</select>
<select id="getToDoNum" resultType="java.lang.Integer">
SELECT COUNT(*) FROM
(SELECT
b.sid
FROM
as_busrepair_inventorybill_detail AS d
LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid
LEFT JOIN as_busrepair_bill as b ON i.sourceBillSid = b.sid
LEFT JOIN as_busrepair_bill_vech as v ON v.billSid = b.sid
where d.operUserSid = #{userSid} and d.state = 1
GROUP BY i.sourceBillSid) as a
</select>
<select id="selGoodsReceiveByBillSid"
resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo">
SELECT d.sid,
@ -305,6 +318,61 @@
WHERE
totalCount != 0
</select>
<select id="getToDoNum2" resultType="java.lang.Integer">
SELECT COUNT(*) FROM
(SELECT
j.*,
IF(j.totalCount = j.count, true, false) as isCanSubmit,
concat(j.count,'/',j.totalCount) confrimInfo
FROM
(
SELECT
a.*,
(
SELECT
COUNT(*)
FROM
as_busrepair_inventorybill_detail AS d
LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
WHERE
i.sourceBillSid = a.sid
) totalCount,
(
SELECT
COUNT(*)
FROM
as_busrepair_inventorybill_detail AS d
LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
WHERE
i.sourceBillSid = a.sid
AND d.state = 2
) AS count
FROM
(
SELECT
b.sid,
b.billNo billId,
b.billType,
b.customerName,
b.entryTime,
b.`subject`,
v.vehMark
FROM
as_busrepair_bill AS b
LEFT JOIN as_busrepair_inventorybill AS i ON i.sourceBillSid = b.sid
LEFT JOIN as_busrepair_inventorybill_detail AS d ON d.billSid = i.sid
LEFT JOIN as_busrepair_bill_vech AS v ON v.billSid = b.sid
WHERE b.deptSid = #{useOrgSid} AND b.repairState = 1
GROUP BY
b.sid
) a
) AS j
WHERE
totalCount != 0) as mm
WHERE mm.isCanSubmit = 1
</select>
<select id="goodsConfrimInfoList"
resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimDetailsVo">
SELECT d.goodsSpuName goodsName,
@ -838,4 +906,6 @@
${ew.sqlSegment}
</where>
</select>
</mapper>

16
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
View File

@ -10,7 +10,6 @@ import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
import com.yxt.anrui.as.biz.asbusrepairbillinvoice.AsBusrepairBillInvoiceService;
import com.yxt.anrui.as.biz.asbusrepairbillsitem.AsBusrepairBillSitemService;
import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairerRest;
import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairerService;
import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
@ -19,6 +18,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -288,6 +288,13 @@ public class AsBusrepairBillRest {
return rb.success().setData(pv);
}
@ApiOperation("手机端-查询本分公司下代办数量:切换机构")
@GetMapping("/getToDoNum")
@ResponseBody
ResultBean<String> getToDoNum(@SpringQueryMap AsToDoNumQuery asToDoNumQuery) {
return asBusrepairBillService.getToDoNum(asToDoNumQuery);
}
@PostMapping("/submitList")
@ApiOperation("配件确认提交")
ResultBean submitList(@RequestBody GoodsReceiveSubmit query) {
@ -311,6 +318,13 @@ public class AsBusrepairBillRest {
return rb.success().setData(pv);
}
@ApiOperation("手机端-查询本分公司下代办数量:切换机构")
@GetMapping("/getToDoNum2")
@ResponseBody
ResultBean<String> getToDoNum2(@SpringQueryMap AsToDoNumQuery asToDoNumQuery) {
return asBusrepairBillService.getToDoNum2(asToDoNumQuery);
}
@PostMapping("/submitList2")
@ApiOperation("维修确认提交")
ResultBean submitList2(@RequestBody GoodsReceiveSubmit query) {

28
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
View File

@ -2131,6 +2131,13 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
return p;
}
public ResultBean<String> getToDoNum(AsToDoNumQuery asToDoNumQuery) {
ResultBean rb = ResultBean.fireFail();
String userSid = asToDoNumQuery.getUserSid();
int count = baseMapper.getToDoNum(userSid);
return rb.success().setData(String.valueOf(count));
}
public void submitList(GoodsReceiveSubmit query) {
List<String> list = query.getList();
if (!list.isEmpty()) {
@ -2176,6 +2183,24 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
}
public ResultBean<String> getToDoNum2(AsToDoNumQuery asToDoNumQuery) {
ResultBean rb = ResultBean.fireFail();
String orgPath = asToDoNumQuery.getOrgPath();
List<String> split = Arrays.asList(orgPath.split("/"));
String useOrgSid = "";
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
useOrgSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
useOrgSid = sysOrganization.getSid();
}
String userSid = asToDoNumQuery.getUserSid();
int count = baseMapper.getToDoNum2(useOrgSid);
return rb.success().setData(String.valueOf(count));
}
public void submitList2(GoodsReceiveSubmit query) {
List<String> list = query.getList();
if (!list.isEmpty()) {
@ -2941,4 +2966,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
baseMapper.updateManuReportNo(sid, manuReportNo, reportFirstDate);
return rb.success();
}
}

27
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java
View File

@ -3,20 +3,18 @@ package com.yxt.wms.apiadmin.inventroy;
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.wmsgoodstag.app.*;
import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillDto2;
import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillPageVo;
import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillQuery;
import com.yxt.wms.biz.inventory.wmsgoodstag.app.GoodsTagVo;
import com.yxt.wms.biz.inventory.wmsgoodstag.app.HousePrintVo;
import com.yxt.wms.biz.inventory.wmsgoodstag.app.PrintQuery;
import com.yxt.wms.biz.inventory.wmsgoodstag.app.TagQuery;
import com.yxt.wms.biz.inventory.wmsshelfbill.*;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -64,8 +62,8 @@ public class WmsShelfBillRest {
*/
@ApiOperation("新增初始化")
@GetMapping("/getInit")
ResultBean<ShelfInitVo> getInit(@RequestParam("sid") String sid,@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid) {
return wmsShelfBillService.getInit(sid,orgPath,userSid);
ResultBean<ShelfInitVo> getInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid) {
return wmsShelfBillService.getInit(sid, orgPath, userSid);
}
@ApiOperation("确认")
@ -84,6 +82,13 @@ public class WmsShelfBillRest {
return rb.success().setData(pv);
}
@ApiOperation("手机端-查询本分公司下代办数量:切换机构")
@GetMapping("/getToDoNum")
@ResponseBody
ResultBean<String> getToDoNum(@SpringQueryMap WmsToDoNumQuery wmsToDoNumQuery) {
return wmsShelfBillService.getToDoNum(wmsToDoNumQuery);
}
@ApiOperation("上架初始化")
@GetMapping("shelvesOperaInit/{sid}")
public ResultBean<AppShelInitVo> shelvesOperaInit(@PathVariable("sid") String sid) {
@ -93,8 +98,8 @@ public class WmsShelfBillRest {
@ApiOperation("扫码")
@GetMapping("scan")
public ResultBean<AppScanVo> scan(@RequestParam(value = "shelvesId", required = false) String shelvesId,@RequestParam(value = "content") String content) {
return wmsShelfBillService.scan(shelvesId,content);
public ResultBean<AppScanVo> scan(@RequestParam(value = "shelvesId", required = false) String shelvesId, @RequestParam(value = "content") String content) {
return wmsShelfBillService.scan(shelvesId, content);
}
@ApiOperation("上架保存")

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java
View File

@ -24,4 +24,6 @@ public interface WmsShelfBillMapper extends BaseMapper<WmsShelfBill> {
String selectCodeNum(String bill);
IPage<AppShelfBillListVo> applistPage(IPage<WmsShelfBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsShelfBill> qw);
int getToDoNum(@Param("userSid") String userSid);
}

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml
View File

@ -69,4 +69,8 @@
${ew.sqlSegment}
</where>
</select>
<select id="getToDoNum" resultType="java.lang.Integer">
select count(*)
from wms_shelf_bill wsb where wsb.upShelfSid = #{userSid} and wsb.billStateValue != '已完成'
</select>
</mapper>

11
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
View File

@ -38,8 +38,6 @@ import com.yxt.wms.biz.inventory.wmsshelfbill.app.*;
import com.yxt.wms.biz.inventory.wmsshelfbilldetail.*;
import com.yxt.wms.feign.as.AsBusrepairInventorybill;
import com.yxt.wms.feign.as.AsBusrepairInventorybillFeign;
import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill;
import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign;
import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailFeign;
import com.yxt.wms.feign.base.basegoodspu.BaseGoodsSpu;
@ -595,6 +593,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
return p;
}
public ResultBean<String> getToDoNum(WmsToDoNumQuery wmsToDoNumQuery) {
ResultBean rb = ResultBean.fireFail();
String userSid = wmsToDoNumQuery.getUserSid();
int count = baseMapper.getToDoNum(userSid);
return rb.success().setData(String.valueOf(count));
}
public ResultBean<AppShelInitVo> shelvesOperaInit(String sid) {
ResultBean rb = ResultBean.fireFail();
AppShelInitVo vo = new AppShelInitVo();
@ -1307,4 +1312,6 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
vo.setGoods(list);
return rb.success().setData(vo);
}
}

12
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsToDoNumQuery.java
View File

@ -0,0 +1,12 @@
package com.yxt.wms.biz.inventory.wmsshelfbill;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class WmsToDoNumQuery {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
}
Write Preview
Loading…
Cancel
Save