修改出入库查询

3 months ago · 42fef79280
9 changed files with 51 additions and 24 deletions
--- 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
@ -14,8 +14,6 @@ import com.yxt.anrui.as.api.asbusrepairinventorybill.*;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
-import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo;
-import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
 import com.yxt.anrui.as.api.utils.AsRule;
 import com.yxt.anrui.as.api.utils.domain.AsBillNo;
 import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
@ -40,7 +38,6 @@ 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 javassist.Loader;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@ -263,6 +260,19 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
    public String saveBill(AsBusrepairInventorybillDto dto, String busTypeKey) {
        AsBusrepairInventorybill entity = new AsBusrepairInventorybill();
        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        String sourceBillSid = entity.getSourceBillSid();//维修单sid
+        AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(sourceBillSid);
+        String customerSid = "";
+        String customerName = "";
+        if (null != asBusrepairBill) {
+            if (StringUtils.isNotBlank(asBusrepairBill.getCustomerSid())) {
+                customerSid = asBusrepairBill.getCustomerSid();
+            }
+            if (StringUtils.isNotBlank(asBusrepairBill.getCustomerName())) {
+                customerName = asBusrepairBill.getCustomerName();
+            }
+        }
+
        int isEnable = 0;
        if (busTypeKey.equals("0")) {
            entity.setBusTypeKey("0");
@ -383,6 +393,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                    BeanUtil.copyProperties(inventory, recordDto, "sid", "createBySid");
                    recordDto.setCount(sDto.getCount());
                    recordDto.setCurrentCount(subtractCount.toString());
+                    recordDto.setCustomerSid(customerSid);
+                    recordDto.setCustomerName(customerName);
                    wmsInventoryRecordFeign.save(recordDto);
                } else if (busTypeKey.equals("1")) {
                    //维修退库
@ -405,6 +417,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                    BeanUtil.copyProperties(inventory, recordDto, "sid", "createBySid");
                    recordDto.setCount(sDto.getCount());
                    recordDto.setCurrentCount(add.toString());
+                    recordDto.setCustomerSid(customerSid);
+                    recordDto.setCustomerName(customerName);
                    wmsInventoryRecordFeign.save(recordDto);
                }
                wmsInventoryFeign.updateInventoryCount(countQuery);
--- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventoryrecord/WmsInventoryRecordDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventoryrecord/WmsInventoryRecordDto.java
@ -125,4 +125,8 @@ public class WmsInventoryRecordDto implements Dto {
    private String preBillSid;
    @ApiModelProperty("前一单编号")
    private String preBillNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
@ -963,6 +963,8 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
                        BeanUtil.copyProperties(inventory, recordDto, "sid", "createBySid");
                        recordDto.setCount(inventoryCount.toString());
                        recordDto.setCurrentCount(subtractCount.toString());
+                        recordDto.setCustomerSid(smsSalesBill.getCustomerSid());
+                        recordDto.setCustomerName(smsSalesBill.getCustomerName());
                        wmsInventoryRecordFeign.save(recordDto);
                        WmsUpdateCountQuery countQuery = new WmsUpdateCountQuery();
                        countQuery.setSid(inventorySid);
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/wms/wmsinventoryrecord/WmsInventoryRecordDto.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/wms/wmsinventoryrecord/WmsInventoryRecordDto.java
@ -112,5 +112,8 @@ public class WmsInventoryRecordDto implements Dto {
    private String createOrgSid;
    @ApiModelProperty("使用组织sid")
    private String useOrgSid;
-
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java
@ -150,6 +150,9 @@ public class WmsInventoryRecordRest {
 	@PostMapping("/pageList")
 	ResultBean<PagerVo<WmsInventoryRecordsVo>> pageList(@RequestBody PagerQuery<WmsInventoryRecordsQuery> pagerQuery){
 		ResultBean<PagerVo<WmsInventoryRecordsVo>> rb = ResultBean.fireFail();
+		WmsInventoryRecordsQuery params = pagerQuery.getParams();
+		params.setType("配件库");
+		pagerQuery.setParams(params);
 		PagerVo<WmsInventoryRecordsVo> pv = wmsInventoryRecordService.listPage(pagerQuery);
 		return rb.success().setData(pv);
 	}
@ -166,6 +169,7 @@ public class WmsInventoryRecordRest {
 	@PostMapping("/exportExcel")
 	@ApiOperation(value = "出入库记录导出")
 	public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) {
+		query.setType("配件库");
 		//得到所有要导出的数据
 		List<WmsInventoryRecordsExcelVo> exportVoList = wmsInventoryRecordService.listExcel(query);
 		//定义导出的excel名字
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java
@ -118,4 +118,8 @@ public class WmsInventoryRecord extends BaseEntity {
    private String preBillSid;
    @ApiModelProperty("前一单编号")
    private String preBillNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java
@ -27,13 +27,10 @@ package com.yxt.wms.biz.inventory.wmsinventoryrecord;


 import com.yxt.common.core.dto.Dto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import java.math.BigDecimal;
-
 /**
 * Project: wms(yxt) <br/>
 * File: WmsInventoryRecordDto.java <br/>
@ -128,4 +125,8 @@ public class WmsInventoryRecordDto implements Dto {
    private String preBillSid;
    @ApiModelProperty("前一单编号")
    private String preBillNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
@ -28,28 +28,24 @@ package com.yxt.wms.biz.inventory.wmsinventoryrecord;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
-import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*;
 import com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsListVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
-import com.yxt.wms.feign.portal.sysuser.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@ -318,9 +314,7 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
            qw.like("wir.handlerName", query.getHandlerName());
        }
        if (StringUtils.isNotBlank(query.getType())) {
-            if (query.getType().equals("拆件库")) {
-                qw.eq("i.warehouseTypeValue", "拆件库");
-            }
+            qw.eq("i.warehouseTypeValue", query.getType());
        }
        IPage<WmsInventoryRecord> page = PagerUtil.queryToPage(pagerQuery);
        IPage<WmsInventoryRecordsVo> pagging = baseMapper.listPage(page, qw);
@ -415,9 +409,7 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
            qw.like("wir.handlerName", query.getHandlerName());
        }
        if (StringUtils.isNotBlank(query.getType())) {
-            if (query.getType().equals("拆件库")) {
-                qw.eq("i.warehouseTypeValue", "拆件库");
-            }
+            qw.eq("i.warehouseTypeValue", query.getType());
        }
        List<WmsInventoryRecordsExcelVo> list = baseMapper.listExcel(qw);
        list.removeAll(Collections.singleton(null));
--- 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
@ -795,8 +795,9 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                recordDto.setHandlerSid(dto.getUserSid());
                recordDto.setHandlerName(createByName);
                recordDto.setGoodsID(goodsID);
-                recordDto.setSourceBillSid(shelvesId);
-                recordDto.setBillNo(wmsShelfBill.getBillNo());
+                recordDto.setPreBillSid(shelvesId);
+                recordDto.setPreBillNo(wmsShelfBill.getBillNo());
+
                recordDto.setBillType("1");
                recordDto.setBusTypeKey("01");
                recordDto.setBusTypeValue("采购入库");
@ -821,6 +822,8 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                        String ansSid = wmsReceiptBill.getSourceBillSid(); //预约入库sid
                        WmsAnsBill ansBill = wmsAnsBillService.fetchBySid(ansSid);
                        if (null != ansBill) {
+                            recordDto.setSourceBillSid(ansBill.getSourceBillSid());
+                            recordDto.setBillNo(ansBill.getSourceBillNo());
                            if (null != ansBill.getTaxRate()) {
                                recordDto.setTaxRate(ansBill.getTaxRate().toString());
                            }