Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 month ago
parent
commit
ed4e50c695
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java
  2. 19
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java
  3. 17
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java
  4. 41
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrand.java
  5. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java
  6. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
  7. 24
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java
  8. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java
  9. 25
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java
  10. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java
  11. 14
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
  12. 28
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  13. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java
  14. 19
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
  15. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
  16. 105
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java
  17. 12
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java
  18. 17
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
  19. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml
  20. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java
  21. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsDetailsVo.java
  22. 15
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
  23. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java
  24. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java
  25. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
  26. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppDetailsVo.java
  27. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfDetailsListVo.java
  28. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfInitListVo.java
  29. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java
  30. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java

@ -63,4 +63,8 @@ public interface BaseManufacturerBankFeign {
@ApiOperation("根据品牌sid和厂家回款通路名称查询银行账号")
@GetMapping("/selectBankAccount/{brandSid}/{manufaSaleChannelValue}")
ResultBean<String> selectBankAccount(@PathVariable("brandSid") String brandSid,@PathVariable("manufaSaleChannelValue") String manufaSaleChannelValue);
@ApiOperation("根据品牌sid和厂家回款通路名称查询付款通路编码key")
@GetMapping("/selectBankAccount/{brandSid}/{actualPay}")
ResultBean<String> selectPaymentAccessNoKey(@PathVariable("brandSid") String brandSid,@PathVariable("actualPay") String actualPay);
}

19
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java

@ -2,22 +2,8 @@ package com.yxt.anrui.base.api.basemanufacturerbank;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
* File: BaseManufacturerBankFeignFallback.java <br/>
* Class: com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeignFallback <br/>
* Description: 供应厂商开户行信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-09-10 11:31:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFeign {
@ -50,4 +36,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe
public ResultBean<String> selectBankAccount(String brandSid, String manufaSaleChannelValue) {
return null;
}
@Override
public ResultBean<String> selectPaymentAccessNoKey(String brandSid, String actualPay) {
return null;
}
}

17
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java

@ -37,19 +37,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-base(厂家退库) <br/>
* File: BaseManufacturerRetwareFeign.java <br/>
* Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign <br/>
* Description: 厂家退库表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-05 17:02:32 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "厂家退库表")
@FeignClient(
contextId = "anrui-base-BaseManufacturerRetware",
@ -77,12 +64,12 @@ public interface BaseManufacturerRetwareFeign {
@PostMapping("/createPdf")
@ResponseBody
public ResultBean<String> createPdf(@RequestParam("sid") String sid);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody

41
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrand.java

@ -6,53 +6,40 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
* File: BaseVehicleBrand.java <br/>
* Class: com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand <br/>
* Description: 品牌信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-09-10 11:31:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "品牌信息", description = "品牌信息")
@TableName("base_vehicle_brand")
@Data
public class BaseVehicleBrand extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("品牌编码(陕汽必须字段)")
@ApiModelProperty("品牌编码(陕汽必须字段)")
private String brandCode;
@ApiModelProperty("品牌名称(陕汽必须字段)")
@ApiModelProperty("品牌名称(陕汽必须字段)")
private String brandName;
@ApiModelProperty("品牌简称(品牌首字母,但不可重复)")
private String brandShortName;
@ApiModelProperty("品牌类型key值")
@ApiModelProperty("品牌类型key值")
private String brandType;
@ApiModelProperty("品牌类型value值")
private String brandTypeValue;
@ApiModelProperty("是否有效(陕汽必须字段)")
@ApiModelProperty("是否有效(陕汽必须字段)")
private String isValidity;
@ApiModelProperty("创建组织(陕汽必须的字段)")
@ApiModelProperty("创建组织(陕汽必须的字段)")
private String createOrg;
@ApiModelProperty("使用组织(陕汽必须的字段)")
@ApiModelProperty("使用组织(陕汽必须的字段)")
private String useOrg;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("厂商sid(陕汽必须字段)")
@ApiModelProperty("厂商sid(陕汽必须字段)")
private String manufacturerSid;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@ -85,4 +85,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
List<BaseManufacturerBank> selectByManSid(String sid);
int updateBySidIsDeletes(String s);
String selectPaymentAccessNoKey(@Param("brandSid") String brandSid,@Param("actualPay") String actualPay);
}

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@ -175,4 +175,15 @@
UPDATE base_manufacturer_bank
SET isDelete = 1 where sid = #{s}
</update>
<select id="selectPaymentAccessNoKey" resultType="java.lang.String">
SELECT bmb.paymentAccessNoKey
FROM base_manufacturer_bank bmb
LEFT JOIN base_manufacturer bm ON bm.sid = bmb.manufacturerSid
LEFT JOIN base_vehicle_brand bvb ON bvb.manufacturerSid = bm.sid
WHERE bvb.sid = #{brandSid}
AND bmb.actualPay = #{actualPay}
AND bmb.isDelete = 0
AND bm.isDelete = 0
</select>
</mapper>

24
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java

@ -12,19 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
* File: BaseManufacturerBankFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankRest <br/>
* Description: 供应厂商开户行信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-09-10 11:31:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "供应厂商开户行信息")
@RestController
@RequestMapping("v1/basemanufacturerbank")
@ -80,7 +67,7 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
public ResultBean<List<BaseManActualVo>> actualList() {
ResultBean<List<BaseManActualVo>> rb = ResultBean.fireFail();
String supplierTypeValue = "主机厂";
List<BaseManActualVo> voList = baseManufacturerBankService.actualList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode());
List<BaseManActualVo> voList = baseManufacturerBankService.actualList(supplierTypeValue, DictCommonEnum.dueBank.HK_TYPE.getCode());
return rb.success().setData(voList);
}
@ -88,7 +75,7 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
public ResultBean<List<BaseManPayVo>> payList() {
ResultBean<List<BaseManPayVo>> rb = ResultBean.fireFail();
String supplierTypeValue = "主机厂";
List<BaseManPayVo> voList = baseManufacturerBankService.payList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode());
List<BaseManPayVo> voList = baseManufacturerBankService.payList(supplierTypeValue, DictCommonEnum.dueBank.HK_TYPE.getCode());
return rb.success().setData(voList);
}
@ -101,7 +88,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
@Override
public ResultBean<String> selectBankAccount(String brandSid, String manufaSaleChannelValue) {
return baseManufacturerBankService.selectBankAccount(brandSid,manufaSaleChannelValue);
return baseManufacturerBankService.selectBankAccount(brandSid, manufaSaleChannelValue);
}
@Override
public ResultBean<String> selectPaymentAccessNoKey(String brandSid, String actualPay) {
return baseManufacturerBankService.selectPaymentAccessNoKey(brandSid, actualPay);
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@ -110,4 +110,10 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
public int updateBySidIsDeletes(String s) {
return baseMapper.updateBySidIsDeletes(s);
}
public ResultBean<String> selectPaymentAccessNoKey(String brandSid, String actualPay) {
ResultBean rb = ResultBean.fireFail();
String paymentAccessNoKey = baseMapper.selectPaymentAccessNoKey(brandSid, actualPay);
return rb.success().setData(paymentAccessNoKey);
}
}

25
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java

@ -33,31 +33,14 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetware;
import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareQuery;
import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo;
import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDetailsVo;
import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto;
import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign;
/**
* Project: anrui-base(厂家退库) <br/>
* File: BaseManufacturerRetwareFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareRest <br/>
* Description: 厂家退库表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-05 17:02:32 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "厂家退库表")
@RestController("com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareRest")
@RestController
@RequestMapping("v1/basemanufacturerretware")
public class BaseManufacturerRetwareRest implements BaseManufacturerRetwareFeign {
@ -104,10 +87,10 @@ public class BaseManufacturerRetwareRest implements BaseManufacturerRetwareFeign
return baseManufacturerRetwareService.fetchAll(sid);
}
@ApiOperation("生成厂家退库库单pdf")
@PostMapping("/withdrawalPdf")
@ApiOperation("生成厂家退库库单pdf")
@PostMapping("/withdrawalPdf")
@Override
public ResultBean<String> withdrawalPdf(String cgtkdSid, String printerType) {
return baseManufacturerRetwareService.withdrawalPdf(cgtkdSid,printerType);
return baseManufacturerRetwareService.withdrawalPdf(cgtkdSid, printerType);
}
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java

@ -1,11 +1,9 @@
package com.yxt.anrui.fin.api.finpaymentapplydetails;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;

14
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@ -25,25 +25,11 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentrecord;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(财务) <br/>
* File: FinPaymentrecordDto.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto <br/>
* Description: fin_paymentrecord 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-23 13:45:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "fin_paymentrecord 数据传输对象", description = "fin_paymentrecord 数据传输对象")
public class FinPaymentrecordDto implements Dto {

28
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@ -30,7 +30,10 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
@ -97,19 +100,6 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
* Project: anrui-fin(财务) <br/>
* File: FinPaymentapplyService.java <br/>
* Class: com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService <br/>
* Description: fin_paymentapply 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-23 13:45:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMapper, FinPaymentapply> {
@ -147,6 +137,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
private MessageFeign messageFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BaseManufacturerBankFeign baseManufacturerBankFeign;
public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
FinPaymentapplyQuery query = pq.getParams();
@ -669,6 +661,15 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
//款项名称
finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailVo.getCostTitleKey());
finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailVo.getCostTitleValue());
if ("009".equals(finPaymentapplyDetailVo.getCostTitleKey())) {
String paymentAccessNoKey = baseManufacturerBankFeign.selectPaymentAccessNoKey(finPaymentapply.getCarBrandSid(), finPaymentapplyDetailVo.getActualPay()).getData();
finPaymentrecordDto.setPayChannel(paymentAccessNoKey);
finPaymentrecordDto.setPayCostType("payChannel");
} else {
finPaymentrecordDto.setPayChannel(finPaymentapplyDetailVo.getCostTitleKey());
finPaymentrecordDto.setPayCostType("payCostType");
}
finPaymentrecordDto.setFinDataType(0);
//款项详情
finPaymentrecordDto.setCostTitleKey(finPaymentapplyDetailVo.getCostTitleKey());
finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailVo.getCostTitleValue());
@ -699,6 +700,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
finPaymentrecordService.saveDto(finPaymentrecordDto);
List<FinPaymentapplyDetailsBelowDetailsVo> finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid());
for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) {
finPaymentrecordDto.setFinDataType(1);
//款项名称
finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailsBelowDetailsVo.getCostTitleKey());
finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowDetailsVo.getCostTitleValue());

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java

@ -112,7 +112,7 @@ public interface LoanSettleApplyFeign {
);
@ApiOperation(value = "推送资方结清款凭证")
@PostMapping(value = "/pushBankVoucher")
@PostMapping(value = "/pushBankReturnVoucher")
ResultBean<RskVoucher> pushBankReturnVoucher(@RequestParam("sid") String sid,
@RequestParam("accountNumber") String accountNumber,
@RequestParam("payTypeCode") String payTypeCode,

19
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@ -18,13 +18,13 @@
a1.dueMoney AS bankMonthRep,
MIN(a1.dueDate) AS firstBeDate, -- 改为取最早逾期日期
COUNT(a1.sid) AS beOverduePeriod,
SUM(a1.yq_total) +
ROUND(SUM(a1.yq_total) +
COALESCE(lbpv_sum.bankBeInter_sum, 0) +
COALESCE(lfd_sum.fund_sum, 0) AS beOverdueMoney,
CAST(COALESCE(lfd_sum.fund_sum, 0) AS DECIMAL(10,2)),2) AS beOverdueMoney,
ROUND(
(SUM(a1.yq_total) + COALESCE(lbpv_sum.bankBeInter_sum, 0) + COALESCE(lfd_sum.fund_sum, 0)) /
MAX(a1.qjyh), -- 保证聚合正确性
1
2
) AS beOverdueMoneyAndPeriod,
SUM(a1.yd_dkje) AS advMoney,
SUM(a1.yd_zjzyf) AS fundPossCostMoney,
@ -135,10 +135,13 @@
MAX(a1.vehMark) AS carNum,
MIN(a1.dueDate) AS firstBeDate, -- 根据业务需求确定合适的聚合函数
COUNT(a1.sid) AS beOverduePeriod,
CAST(SUM(a1.yq_total) AS DECIMAL(10,2)) + CAST(IFNULL(MAX(a1.bankBeInter_sum), 0) AS DECIMAL(10,2)) + CAST(IFNULL(MAX(a1.fund_sum), 0) AS DECIMAL(10,2)) AS beOverdueMoney,
ROUND(
SUM(a1.yq_total) + IFNULL(MAX(a1.bankBeInter_sum), 0) + IFNULL(MAX(a1.fund_sum), 0),
2
) AS beOverdueMoney,
ROUND(
(SUM(a1.yq_total) + IFNULL(MAX(a1.bankBeInter_sum), 0) + IFNULL(MAX(a1.fund_sum), 0)) / MAX(a1.qjyh),
1
2
) AS beOverdueMoneyAndPeriod,
a1.busVinSid AS saleVehSid,
MAX(a1.salesOrderSid) AS salesOrderSid,
@ -263,13 +266,13 @@
a1.dueMoney AS bankMonthRep,
MIN(a1.dueDate) AS firstBeDate, -- 改为取最早逾期日期
COUNT(a1.sid) AS beOverduePeriod,
SUM(a1.yq_total) +
ROUND(SUM(a1.yq_total) +
COALESCE(lbpv_sum.bankBeInter_sum, 0) +
COALESCE(lfd_sum.fund_sum, 0) AS beOverdueMoney,
CAST(COALESCE(lfd_sum.fund_sum, 0) AS DECIMAL(10,2)),2) AS beOverdueMoney,
ROUND(
(SUM(a1.yq_total) + COALESCE(lbpv_sum.bankBeInter_sum, 0) + COALESCE(lfd_sum.fund_sum, 0)) /
MAX(a1.qjyh), -- 保证聚合正确性
1
2
) AS beOverdueMoneyAndPeriod,
SUM(a1.yd_dkje) AS advMoney,
SUM(a1.yd_zjzyf) AS fundPossCostMoney,

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loansettleapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -3633,6 +3632,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
if (formatDate.compareTo(settingDate) > 0) {
return rb.setMsg("只能在结清申请发起当日确认客户结清,若需结清,请将结清日期修改为当天,重新发起结清申请!");
}
if (loanSettleApply.getState().intValue() == 1) {
return rb.setMsg("该申请已完成客户确认结清,请勿重复点击!");
}
loanSettleApply.setState(1);
baseMapper.updateById(loanSettleApply);
//结转剩余保证金

105
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java

@ -34,77 +34,62 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-scm(车辆入库单查询) <br/>
* File: ScmApplyInboundQueryFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest <br/>
* Description: 车辆入库单查询. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-28 15:55:31 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "车辆入库单查询")
@RestController("com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest")
@RestController
@RequestMapping("v1/scmapplyinboundquery")
public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign {
@Autowired
private ScmApplyInboundQueryService scmApplyInboundQueryService;
@Autowired
private ScmApplyInboundQueryService scmApplyInboundQueryService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmApplyInboundQueryVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundQueryQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmApplyInboundQueryVo> pv = scmApplyInboundQueryService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmApplyInboundQueryVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundQueryQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmApplyInboundQueryVo> pv = scmApplyInboundQueryService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean<String> save(@RequestBody ScmApplyInboundQueryDto dto){
ResultBean rb = ResultBean.fireFail();
String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto);
return rb.success().setData(sid);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean<String> save(@RequestBody ScmApplyInboundQueryDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto);
return rb.success().setData(sid);
}
@Override
@ApiOperation("根据sid批量删除")
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmApplyInboundQueryService.delBySids(sids);
return rb.success();
}
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
scmApplyInboundQueryService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmApplyInboundQueryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
public ResultBean<ScmApplyInboundQueryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<PdfPath> createPdf(String cgrkdSid,String printerType) {
return scmApplyInboundQueryService.createPdf(cgrkdSid,printerType);
}
@Override
public ResultBean<PdfPath> createPdf(String cgrkdSid, String printerType) {
return scmApplyInboundQueryService.createPdf(cgrkdSid, printerType);
}
@Override
public ResultBean ctcgykd(String cgrkdSid) {
return scmApplyInboundQueryService.ctcgykd(cgrkdSid);
}
@Override
public ResultBean ctcgykd(String cgrkdSid) {
return scmApplyInboundQueryService.ctcgykd(cgrkdSid);
}
@Override
public ResultBean<Integer> fetchByApplicationCode(String applicationCode) {
return scmApplyInboundQueryService.fetchByApplicationCode(applicationCode);
}
@Override
public ResultBean<Integer> fetchByApplicationCode(String applicationCode) {
return scmApplyInboundQueryService.fetchByApplicationCode(applicationCode);
}
}

12
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java

@ -790,14 +790,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("发起申请");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -841,15 +844,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("发起申请");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -2434,7 +2439,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
cost = new BigDecimal(s.getGoodsCost());
}
SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery();
flowNodeQuery.setType(0);
flowNodeQuery.setType(1);
flowNodeQuery.setFlowName("商品配件销售结算申请");
flowNodeQuery.setCreateOrgName(vo.getUseOrgName());
flowNodeQuery.setProcDefId("process_q2p7s958752");
@ -2442,14 +2447,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("发起申请");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("配件主管审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);

17
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@ -76,6 +76,7 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
private AsBusrepairBillNodeService asBusrepairBillNodeService;
@Autowired
private WmsInventoryRecordFeign wmsInventoryRecordFeign;
/**
* 维修出/退库分页列表
*
@ -297,7 +298,7 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
}
if (count.compareTo(BigDecimal.ZERO) > 0) {
AsBusrepairInventorybillDetail detail = new AsBusrepairInventorybillDetail();
BeanUtil.copyProperties(sDto, detail,"id","sid");
BeanUtil.copyProperties(sDto, detail, "id", "sid");
if (isEnable == 1) {
detail.setCurrentCount(count);
} else if (isEnable == 2) {
@ -307,10 +308,15 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
BigDecimal discount = BigDecimal.ZERO;//折扣
BigDecimal cost = BigDecimal.ZERO;//成本单价
BigDecimal price = BigDecimal.ZERO;// 单价
BigDecimal amountBefore = BigDecimal.ZERO;//退货之前材料费
BigDecimal amountSub = BigDecimal.ZERO;//退货后材料费差额
if (null != detailUpdate) {
if (null != detailUpdate.getCurrentCount()) {
currentCount = detailUpdate.getCurrentCount();
}
if (null != detailUpdate.getAmount()) {
amountBefore = detailUpdate.getAmount();
}
if (null != detailUpdate.getDiscount()) {
discount = new BigDecimal(detailUpdate.getDiscount()).multiply(new BigDecimal("0.1"));
}
@ -332,6 +338,15 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
if (StringUtils.isNotBlank(sDto.getReturnAmount())) {
detail.setAmount(new BigDecimal(sDto.getReturnAmount()));
}
//退货后修改维修单应收实收材料费
amountSub = amountBefore.subtract(priceSubtract);
BigDecimal receivableAmount = asBusrepairBill.getReceivableAmount();
BigDecimal actualAmount = asBusrepairBill.getActualAmount();
BigDecimal goodsAmount = asBusrepairBill.getGoodsAmount();
asBusrepairBill.setReceivableAmount(receivableAmount.subtract(amountSub));
asBusrepairBill.setActualAmount(actualAmount.subtract(amountSub));
asBusrepairBill.setGoodsAmount(goodsAmount.subtract(amountSub));
asBusrepairBillService.updateById(asBusrepairBill);
}
}
detail.setBillSid(entity.getSid());

5
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml

@ -48,9 +48,10 @@
wab.supplierName,
DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
case wab.billState when 0 then '在途' when 1 then '部分收货'
when 2 then '已收货' when 3 then '已取消'
when 2 then '已收货' when 3 then '已收货(部分终止)'
end as billState,
wab.reviewStatus
wab.reviewStatus,
wab.manufactorBillNo
from wms_ans_bill wab
where sid = #{sid}
</select>

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java

@ -9,11 +9,7 @@ import com.yxt.common.base.utils.StringUtils;
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.base.wmswarehousearea.WmsWarehouseAreaVo;
import com.yxt.wms.biz.inventory.wmsansbilldetail.*;
import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBill;
import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillQuery;
import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillVo;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
@ -83,7 +79,7 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType("YGDHTZD");
b.setBillType("YQDHTZD");
String bill = Rule.getBill(b);
String i = baseMapper.selectNum(bill);
String billNo = "";

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsDetailsVo.java

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -35,6 +34,7 @@ public class WmsAnsDetailsVo {
//单据状态
private String billState;
private String manufactorBillNo; //厂家订单号
@ApiModelProperty("审核状态(待审核、审核通过、审核拒绝)")
private String reviewStatus;

15
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@ -2,7 +2,6 @@ package com.yxt.wms.biz.inventory.wmsreceiptbill;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
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.service.MybatisBaseService;
@ -13,26 +12,21 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBill;
import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillService;
import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillVo;
import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetail;
import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailService;
import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.*;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatch;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService;
import com.yxt.wms.biz.inventory.wmsshelfbill.ShelfInitVo;
import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillDto;
import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillService;
import com.yxt.wms.biz.inventory.wmsshelfbilldetail.ShelfInitListVo;
import com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetailDto;
import com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetailService;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
import com.yxt.wms.feign.portal.sysuser.SysUserVo;
import com.yxt.wms.utils.BillNo;
import com.yxt.wms.utils.Rule;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,7 +34,6 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
* @description:
@ -350,7 +343,13 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
BeanUtil.copyProperties(wmsAnsListDetailsVo, detailsVo);
detailsVo.setIsQuality(0);
detailsVo.setQualityState(0);
detailsVo.setActualInCount("");
if (StringUtils.isNotBlank(wmsAnsListDetailsVo.getWaitInCount())) {
detailsVo.setActualInCount(wmsAnsListDetailsVo.getWaitInCount());
detailsVo.setMaxCount(wmsAnsListDetailsVo.getWaitInCount());
} else {
detailsVo.setActualInCount(wmsAnsListDetailsVo.getOrderCount());
detailsVo.setMaxCount(wmsAnsListDetailsVo.getOrderCount());
}
detailsVo.setRejectCount("");
detailsVo.setRejectReason("");
lists.add(detailsVo);

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java

@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
@ -72,4 +70,5 @@ public class WmsReceiptBillDetailDto2 {
private String shelfLife;
@ApiModelProperty("已分配数量 ")
private String allotmentNum;
private String maxCount;
}

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java

@ -1,13 +1,8 @@
package com.yxt.wms.biz.inventory.wmsreceiptbilldetail;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -65,6 +60,7 @@ public class WmsReceiptBillDetailVo {
private Integer shelfLife;
@ApiModelProperty("预约数量(采购订单数量)")
private String orderCount;
private String maxCount;

1
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@ -546,6 +546,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
}
BigDecimal subtract = actualInCount.subtract(shelfCount);
shelfInitListVo.setCount(subtract.toString());
shelfInitListVo.setMaxCount(subtract.toString());
// shelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber());
// shelfInitListVo.setWarehouseSid(v.getWarehouseSid());
// shelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid());

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppDetailsVo.java

@ -59,8 +59,8 @@ public class AppDetailsVo {
private String count;
@ApiModelProperty("已上/未上架数量")
private String actualNoCount;
//载具编号
private String packageNo;
//备注
private String remarks;
}

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfDetailsListVo.java

@ -45,8 +45,8 @@ public class ShelfDetailsListVo implements Vo {
private String warehouseRackName;
//已上架数量
private String actualCount;
//载具编号
private String packageNo;
//备注
private String remarks;
}

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfInitListVo.java

@ -3,8 +3,6 @@ package com.yxt.wms.biz.inventory.wmsshelfbilldetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
@ -37,6 +35,8 @@ public class ShelfInitListVo {
private String actualCount;
@ApiModelProperty("未上架数量")
private String noShelfCount;
@ApiModelProperty("载具编号")
private String packageNo;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("上架数量最大值")
private String maxCount;
}

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java

@ -37,7 +37,7 @@ public class WmsShelfBillDetail extends BaseEntity {
private BigDecimal count;
@ApiModelProperty("已上架数量(根据上架记录计算)")
private BigDecimal actualCount;
@ApiModelProperty("载具编号")
private String packageNo;
@ApiModelProperty("备注")
private String remarks;
}

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java

@ -3,8 +3,6 @@ package com.yxt.wms.biz.inventory.wmsshelfbilldetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
@ -35,7 +33,7 @@ public class WmsShelfBillDetailDto {
private String count;
@ApiModelProperty("已上架数量(根据上架记录计算)")
private String actualCount;
@ApiModelProperty("载具编号")
private String packageNo;
@ApiModelProperty("备注")
private String remarks;
}

Loading…
Cancel
Save