修改售后入库问题

1 month ago · 8a284b288d
14 changed files with 46 additions and 39 deletions
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/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);
        //结转剩余保证金
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
+++ b/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());
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml
+++ b/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>
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java
+++ b/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 = "";
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsDetailsVo.java
+++ b/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;
--- 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
@ -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);
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java
+++ b/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;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java
+++ b/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;



--- 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
@ -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());
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppDetailsVo.java
+++ b/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;


    }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfDetailsListVo.java
+++ b/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;


 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/ShelfInitListVo.java
+++ b/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;
 }
--- 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
@ -37,7 +37,7 @@ public class WmsShelfBillDetail extends BaseEntity {
    private BigDecimal count;
    @ApiModelProperty("已上架数量(根据上架记录计算)")
    private BigDecimal actualCount;
-    @ApiModelProperty("载具编号")
-    private String packageNo;
+    @ApiModelProperty("备注")
+    private String remarks;

 }
--- 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
@ -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;

 }