diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java index 285e10c27f..46ef6f2a6f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java @@ -25,28 +25,14 @@ *********************************************************/ package com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve; - +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; +import java.util.Date; -/** - * Project: anrui-fin(平仓)
- * File: FinPaymentapplyDetailsBelowEveVo.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo
- * Description: 付款申请明细-明细-平仓 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 10:03:07
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "付款申请明细-明细-平仓 视图数据对象", description = "付款申请明细-明细-平仓 视图数据对象") public class FinPaymentapplyDetailsBelowEveVo implements Vo { @@ -58,7 +44,8 @@ public class FinPaymentapplyDetailsBelowEveVo implements Vo { @ApiModelProperty("平仓款名称") private String costTitleValue; @ApiModelProperty("融资付款开通日期") - private String openDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date openDate; @ApiModelProperty("期数") private String period; @ApiModelProperty("付款单位名称") @@ -75,4 +62,6 @@ public class FinPaymentapplyDetailsBelowEveVo implements Vo { private BigDecimal exePayPrice; @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("上级sid") + private String detailSid; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java index db8b53a937..bb9897922c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java @@ -30,23 +30,9 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; import java.util.Date; -/** - * Project: anrui-fin(财务)
- * File: FinPaymentrecord.java
- * Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord
- * Description: fin_paymentrecord.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "fin_paymentrecord", description = "fin_paymentrecord") @TableName("fin_paymentrecord") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java index d15892605d..4b464e1408 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java @@ -99,7 +99,7 @@ public class FinPaymentRest implements FinPaymentFeign { @Override public ResultBean updateOpenDate(String sid, String openDate) { ResultBean rb = ResultBean.fireFail(); - finPaymentapplyDetailsBelowEveService.updateOpenDate(sid,openDate); + finPaymentapplyDetailsBelowService.updateOpenDate(sid,openDate); return rb.success(); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index ecdfe5a78d..e7a6700a91 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -698,6 +698,8 @@ public class FinPaymentapplyService extends MybatisBaseService finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid()); for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) { @@ -726,7 +728,40 @@ public class FinPaymentapplyService extends MybatisBaseService finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDetailsVo.getFinPaymentapplyDetailsBelowEveList(); + for (FinPaymentapplyDetailsBelowEveDetailsVo finPaymentapplyDetailsBelowEveDetailsVo : finPaymentapplyDetailsBelowEveList) { + finPaymentrecordDto.setFinDataType(1); + //款项名称 + finPaymentrecordDto.setCostTypeKey(""); + finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowEveDetailsVo.getCostTitleValue()); + //款项详情 + finPaymentrecordDto.setCostTitleKey(""); + finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailsBelowEveDetailsVo.getCostTitleValue()); + //付款方式 + finPaymentrecordDto.setPayWayKey(finPaymentapplyDetailsBelowDetailsVo.getPaymentTypeKey()); + finPaymentrecordDto.setPayWayValue(finPaymentapplyDetailsBelowDetailsVo.getPaymentType()); + //是否推送回款返利 + finPaymentrecordDto.setIsPushHkfl(0); + finPaymentrecordDto.setBusSid(finPaymentapplyDetailsBelowEveDetailsVo.getSid()); + //收款银行账号 + finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailsBelowEveDetailsVo.getReceivingAccount()); + finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailsBelowEveDetailsVo.getBank()); + //收款单位名称 + finPaymentrecordDto.setReceiveCompany(finPaymentapplyDetailsBelowEveDetailsVo.getReceiveCompany()); + //金额 + if (finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice() != null) { + finPaymentrecordDto.setCost(finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice().toString()); + finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice().toString()); + } + //备注 + finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue()); + //本次付款说明 + finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailsBelowEveDetailsVo.getRemarks()); + finPaymentrecordService.saveDto(finPaymentrecordDto); + } } } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java index b5314ea26e..b61a8adbe6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java @@ -56,6 +56,8 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList(); for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java index 016ed85fa1..5eb0989249 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java @@ -28,8 +28,11 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow; +import org.apache.ibatis.annotations.Update; + import java.util.List; import java.util.Map; @@ -40,4 +43,7 @@ public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper selByMainSid(String mainSid); List> selClosFundName(String useOrgSid); + + @Update("update fin_paymentapply_details_below set openDate = #{openDate} where sid = #{sid}") + void updateOpenDate(@Param("sid") String sid, @Param("openDate") String openDate); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml index 0714e64c14..66562b0ebc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml @@ -7,7 +7,13 @@ - SELECT * FROM fin_paymentapply_details_below_eve fe - LEFT JOIN anrui_portal.sys_organization as s ON fe.useOrgSid = s.sid + SELECT + fe.*, + fb.openDate + FROM + fin_paymentapply_details_below_eve fe + LEFT JOIN fin_paymentapply_details_below fb + ON fe.detailSid = fb.sid + LEFT JOIN anrui_portal.sys_organization AS s + ON fe.useOrgSid = s.sid ${ew.sqlSegment} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java index fa2ee0be95..e9214a942a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java @@ -32,29 +32,12 @@ 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.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign; -/** - * Project: anrui-fin(平仓)
- * File: FinPaymentapplyDetailsBelowEveFeignFallback.java
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveRest
- * Description: 付款申请明细-明细-平仓.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 10:03:07
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "付款申请明细-明细-平仓") @RestController @RequestMapping("v1/finpaymentapplydetailsbeloweve") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java index ed4c226ce4..081128ffb6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -28,8 +28,6 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import org.apache.commons.lang3.StringUtils; @@ -43,33 +41,15 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.List; -/** - * Project: anrui-fin(平仓)
- * File: FinPaymentapplyDetailsBelowEveService.java
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService
- * Description: 付款申请明细-明细-平仓 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 10:03:07
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService { @Autowired private SysUserFeign sysUserFeign; - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; public PagerVo listPageVo(PagerQuery pq) { FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); @@ -135,8 +115,8 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fe.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fb.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fb.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')" ); //平仓付款日期 qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"). @@ -224,8 +204,4 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService selByMainSid(String mainSid) { return baseMapper.selByMainSid(mainSid); } - - public void updateOpenDate(String sid, String openDate) { - baseMapper.updateOpenDate(sid, openDate); - } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java index 23e3dea6a3..03398ff844 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java @@ -221,6 +221,8 @@ public class WmsReceiptBillService extends MybatisBaseService pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid()); @@ -401,8 +405,8 @@ public class WmsReceiptBillService extends MybatisBaseService stringList = wmsShelfBillDetailService.selectReceiptSidList(); - stringList.removeAll(Collections.singleton(null)); +// List stringList = wmsShelfBillDetailService.selectReceiptSidList(); +// stringList.removeAll(Collections.singleton(null)); //获取收货单据 shelfBillDto.setCreateTime(DateUtil.today());//单据日期 shelfBillDto.setSourceBillNo(wmsReceiptBill.getBillNo());//来源单编号 @@ -413,21 +417,19 @@ public class WmsReceiptBillService extends MybatisBaseService detailDtos = new ArrayList<>(); //获取收货单据的明细 - List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); + List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectListByBillSid(sid); wmsReceiptBillDetailsList.removeAll(Collections.singleton(null)); if (!wmsReceiptBillDetailsList.isEmpty()) { for (int i = 0; i < wmsReceiptBillDetailsList.size(); i++) { WmsReceiptBillDetail v = wmsReceiptBillDetailsList.get(i); -// WmsReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid()); WmsShelfBillDetailDto shelfInitListVo = new WmsShelfBillDetailDto(); BeanUtil.copyProperties(v, shelfInitListVo, "sid"); shelfInitListVo.setReceiptDetailSid(v.getSid()); shelfInitListVo.setCount(v.getActualInCount().toString()); -// shelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber()); -// shelfInitListVo.setWarehouseSid(v.getWarehouseSid()); -// shelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid()); -// shelfInitListVo.setWarehouseRackCode(""); + shelfInitListVo.setActualCount("0"); + shelfInitListVo.setNoShelfCount(v.getActualInCount().toString()); detailDtos.add(shelfInitListVo); + wmsReceiptBillDetailService.updateById(v); } } shelfBillDto.setList(detailDtos); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java index 00b973d46c..5d2b2da5ea 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java @@ -58,8 +58,10 @@ public class WmsReceiptBillDetail extends BaseEntity { @ApiModelProperty("打印次数") private Integer printCount; - @ApiModelProperty("已上架数量") + @ApiModelProperty("已分配数量") private BigDecimal shelfCount; + @ApiModelProperty("待分配数量") + private BigDecimal waitShelfCount; // @ApiModelProperty("仓库名称") // private String warehouseName; // @ApiModelProperty("库位sid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java index ab8aff8917..148f4fca42 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java @@ -24,4 +24,6 @@ public interface WmsReceiptBillDetailMapper extends BaseMapper selByBillSid(@Param("sid") String sid); List selectListByBillSid(@Param("sourceBillSid") String sourceBillSid); + + List selectInitListByBillSid(@Param("sourceBillSid") String sourceBillSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml index 0e8de9f9b1..b5c3e1bcad 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml @@ -31,7 +31,8 @@ wrbd.state, wrbd.sid detailsSid, wrbd.goodsSpuName, - wrbd.orderCount + wrbd.orderCount, + wrbd.shelfCount allotmentNum from wms_receipt_bill_detail wrbd where billSid = #{sid} @@ -50,15 +51,26 @@ + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java index 8d9ba457da..1c2f0f3052 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java @@ -8,7 +8,6 @@ import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailB import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -86,4 +85,8 @@ public class WmsReceiptBillDetailService extends MybatisBaseService selectListByBillSid(String sourceBillSid) { return baseMapper.selectListByBillSid(sourceBillSid); } + + public List selectInitListByBillSid(String sid) { + return baseMapper.selectInitListByBillSid(sid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java index 5a51b40c58..10c1dbae14 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java @@ -26,4 +26,8 @@ public interface WmsShelfBillMapper extends BaseMapper { IPage applistPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); int getToDoNum(@Param("userSid") String userSid); + + int selBillStateCount(String join); + + int selReceiptBillDistributeType(String sid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml index 7c836db1bd..269667d7dd 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml @@ -73,4 +73,33 @@ select count(*) from wms_shelf_bill wsb where wsb.upShelfSid = #{userSid} and wsb.billStateValue != '已完成' + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index f9e9cece98..02454a774e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -174,8 +174,16 @@ public class WmsShelfBillService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -213,6 +221,7 @@ public class WmsShelfBillService extends MybatisBaseService vos = wmsReceiptBillDetailService.selectListByBillSid(dto.getSourceBillSid()); - if (!vos.isEmpty()) { - HashSet integers = new HashSet<>(); - for (WmsReceiptBillDetail vo : vos) { - BigDecimal count = BigDecimal.ZERO; - BigDecimal actualCount = BigDecimal.ZERO; - BigDecimal shelfCount = BigDecimal.ZERO; - if (null != vo.getShelfCount()) { - shelfCount = vo.getShelfCount(); - } - if (null != vo.getActualInCount()) { - actualCount = vo.getActualInCount(); - } - count = actualCount.subtract(shelfCount); - if (count.compareTo(BigDecimal.ZERO) <= 0) { - integers.add(2); - } else { - integers.add(1); - } - } - if (integers.size() > 1) { - wmsReceiptBill.setDistributeType(2); - } else { - wmsReceiptBill.setDistributeType(1); - for (Integer integer : integers) { - if (integer == 1) { - wmsReceiptBill.setDistributeType(2); - } - } - } - } + int receiptBillState = baseMapper.selReceiptBillDistributeType(wmsReceiptBill.getSid()); + wmsReceiptBill.setDistributeType(receiptBillState); wmsReceiptBillService.updateById(wmsReceiptBill); } @@ -293,6 +273,7 @@ public class WmsShelfBillService extends MybatisBaseService vos = wmsReceiptBillDetailService.selectListByBillSid(dto.getSourceBillSid()); - if (!vos.isEmpty()) { - HashSet integers = new HashSet<>(); - for (WmsReceiptBillDetail vo : vos) { - BigDecimal count = BigDecimal.ZERO; - BigDecimal actualCount = BigDecimal.ZERO; - BigDecimal shelfCount = BigDecimal.ZERO; - if (null != vo.getShelfCount()) { - shelfCount = vo.getShelfCount(); - } - if (null != vo.getActualInCount()) { - actualCount = vo.getActualInCount(); - } - count = actualCount.subtract(shelfCount); - if (count.compareTo(BigDecimal.ZERO) <= 0) { - integers.add(2); - } else { - integers.add(1); - } - } - if (integers.size() > 1) { - wmsReceiptBill.setDistributeType(2); - } else { - wmsReceiptBill.setDistributeType(1); - for (Integer integer : integers) { - if (integer == 1) { - wmsReceiptBill.setDistributeType(2); - } - } - } - } + int receiptBillState = baseMapper.selReceiptBillDistributeType(wmsReceiptBill.getSid()); + wmsReceiptBill.setDistributeType(receiptBillState); wmsReceiptBillService.updateById(wmsReceiptBill); } } -// saveWmsInventory(sid); - return rb.success().setData(sid); } @@ -444,8 +394,29 @@ public class WmsShelfBillService extends MybatisBaseService sidss = Arrays.asList(sids); + int count = baseMapper.selBillStateCount(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("请选择单据状态为新建的数据进行删除！"); + } for (int i = 0; i < sidss.size(); i++) { String s = sidss.get(i); + List details = wmsShelfBillDetailService.selectByMainSid(s); + WmsShelfBill wmsShelfBill = fetchBySid(s); + WmsReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(wmsShelfBill.getSourceBillSid()); + for (WmsShelfBillDetail detail : details) { + BigDecimal needCount = detail.getCount();//上架单需上架数量 + String receiptDetailSid = detail.getReceiptDetailSid(); + WmsReceiptBillDetail receiptBillDetail = wmsReceiptBillDetailService.fetchBySid(receiptDetailSid); + BigDecimal shelfCount = receiptBillDetail.getShelfCount();//收货单已分配数量 + BigDecimal waitShelfCount = receiptBillDetail.getWaitShelfCount();//收货单待分配数量 + receiptBillDetail.setShelfCount(shelfCount.subtract(needCount)); + receiptBillDetail.setWaitShelfCount(waitShelfCount.add(needCount)); + wmsReceiptBillDetailService.updateById(receiptBillDetail); + } + //查询收货单分配状态 + int receiptBillState = baseMapper.selReceiptBillDistributeType(wmsReceiptBill.getSid()); + wmsReceiptBill.setDistributeType(receiptBillState); + wmsReceiptBillService.updateById(wmsReceiptBill); wmsShelfBillDetailMapper.deleteByMainSid(s); } delBySids(sids); @@ -512,9 +483,6 @@ public class WmsShelfBillService extends MybatisBaseService stringList = wmsShelfBillDetailService.selectReceiptSidList(); -// stringList.removeAll(Collections.singleton(null)); //获取收货单据 WmsReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid); shelfInitVo.setCreateTime(DateUtil.today());//单据日期 @@ -526,31 +494,16 @@ public class WmsShelfBillService extends MybatisBaseService list = new ArrayList<>(); //获取收货单据的明细 -// List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); - List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectListByBillSid(sid); + List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectInitListByBillSid(sid); wmsReceiptBillDetailsList.removeAll(Collections.singleton(null)); if (!wmsReceiptBillDetailsList.isEmpty()) { for (int i = 0; i < wmsReceiptBillDetailsList.size(); i++) { WmsReceiptBillDetail v = wmsReceiptBillDetailsList.get(i); -// WmsReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid()); ShelfInitListVo shelfInitListVo = new ShelfInitListVo(); BeanUtil.copyProperties(v, shelfInitListVo, "sid"); shelfInitListVo.setReceiptDetailSid(v.getSid()); - BigDecimal shelfCount = BigDecimal.ZERO; - if (null != v.getShelfCount()) { - shelfCount = v.getShelfCount(); - } - BigDecimal actualInCount = BigDecimal.ZERO; - if (null != v.getActualInCount()) { - actualInCount = v.getActualInCount(); - } - 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()); -// shelfInitListVo.setWarehouseRackCode(""); + shelfInitListVo.setCount(v.getWaitShelfCount().toString()); + shelfInitListVo.setMaxCount(v.getWaitShelfCount().toString()); list.add(shelfInitListVo); } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java index 7a9c40c496..3e2278be48 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetail.java @@ -39,5 +39,6 @@ public class WmsShelfBillDetail extends BaseEntity { private BigDecimal actualCount; @ApiModelProperty("备注") private String remarks; - + @ApiModelProperty("未上架数量") + private BigDecimal noShelfCount; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java index 3c1e2f790a..0a60ba7f39 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailDto.java @@ -35,5 +35,6 @@ public class WmsShelfBillDetailDto { private String actualCount; @ApiModelProperty("备注") private String remarks; - + @ApiModelProperty("未上架数量") + private String noShelfCount; }