open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

01/09

Browse Source
This commit is contained in:
wangpengfei
2025-01-09 08:39:34 +08:00
parent 1367937a6d
commit 0ed84567de
7 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java
View File

@@ -359,6 +359,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
warehouseInventory.setCreateOrgSid(dto.getCreateOrgSid());
warehouseInventory.setGoodsSkuCode(dto2.getGoodsSkuCode());
warehouseInventory.setPreBillNo(billNo);
warehouseInventory.setCost(dto2.getPrice());
warehouseInventoryService.saveInventory(warehouseInventory);
}
OperationRecordDto dto1 = new OperationRecordDto();

2
src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java
View File

@@ -120,6 +120,7 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
warehouseInventory.setUserSid(userSid);
warehouseInventory.setUserName(userName);
warehouseInventory.setPreBillNo(p.getBillNo());
warehouseInventory.setCost(v.getPrice());
warehouseInventoryService.saveInventory(warehouseInventory);
baseMapper.insert(purchaseInventoryBillDetail);
}
@@ -195,6 +196,7 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
warehouseInventory.setManufacturerName(warehouseAnsBillDetail.getManufacturerName());
warehouseInventory.setManufacturerSid(warehouseAnsBillDetail.getManufacturerSid());
warehouseInventory.setPreBillNo(p.getBillNo());
warehouseInventory.setCost(v.getPrice());
warehouseInventoryService.saveInventory(warehouseInventory);
baseMapper.insert(purchaseInventoryBillDetail);
}

11
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml
View File

@@ -53,8 +53,10 @@
r.customerSid,
r.customerName,
IFNULL(SUM(r.amount), 0) as amount,
r.cost
r.cost,
IFNULL(SUM(d.freight), 0) as shippingFee
FROM warehouse_inventory_record AS r
left join warehouse_out_bill d on d.billNo=r.preBillNo
<where>
${ew.sqlSegment}
</where>
@@ -76,7 +78,8 @@
d.goodsTypeName
FROM
warehouse_inventory_record AS r
left join purchase_inventory_bill_detail d on d.sourceBillSid =r.preBillNo and d.goodsSkuSid =r.goodsSkuSid
left join purchase_inventory_bill b on b.billNo =r.preBillNo
left join purchase_inventory_bill_detail d on d.sourceBillSid =b.sid and d.goodsSkuSid =r.goodsSkuSid
<where>
${ew.sqlSegment}
</where>
@@ -150,8 +153,10 @@
r.customerSid,
r.customerName,
IFNULL(SUM(r.amount), 0) as amount,
r.cost
r.cost,
IFNULL(SUM(d.freight), 0) as shippingFee
FROM warehouse_inventory_record AS r
left join warehouse_out_bill d on d.billNo=r.preBillNo
<where>
${ew.sqlSegment}
</where>

42
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java
View File

@@ -193,15 +193,15 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
qw.apply(StringUtils.isNotBlank(query.getStartDate()), "r.createTime >= '" + query.getStartDate() + "'").
apply(StringUtils.isNotBlank(query.getEndDate()), "r.createTime <= '" + query.getEndDate() + "'"
);
if(query.getSids()!=null){
qw.in("customerSid",query.getSids());
if(StringUtils.isNotBlank(query.getCustomerSid())){
qw.eq("r.customerSid",query.getCustomerSid());
}
if(StringUtils.isNotBlank(query.getCustomerName())){
qw.like("customerName",query.getCustomerName());
qw.like("r.customerName",query.getCustomerName());
}
qw.eq("r.billType", "0");
qw.groupBy("r.customerSid");
qw.eq("createOrgSid",query.getOrgPath());
qw.eq("r.createOrgSid",query.getOrgPath());
IPage<WarehouseInventoryRecord> page = PagerUtil.queryToPage(pq);
IPage<WarehouseOutReportVo> pagging = baseMapper.customerSales(page, qw);
PagerVo<WarehouseOutReportVo> p = PagerUtil.pageToVo(pagging, null);
@@ -229,7 +229,7 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
qw.eq("d.goodsTypeSid",query.getTypeSid());
}
qw.eq("r.billType", "1");
qw.groupBy("r.goodsSpuSid");
qw.groupBy("r.goodsSkuSid");
qw.eq("r.createOrgSid",query.getOrgPath());
IPage<WarehouseInventoryRecord> page = PagerUtil.queryToPage(pq);
IPage<WarehouseGoodsPurchaseReportVo> pagging = baseMapper.goodsPurchase(page, qw);
@@ -252,14 +252,18 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
qw.eq("r.supplierSid",query.getSupplierSid());
}
if(query.getTypeSids()!=null){
qw.in("r.goodsSpuSid",query.getTypeSids());
if(query.getTypeSids().size()!=0){
qw.in("r.goodsSpuSid",query.getTypeSids());
}
}
if(query.getBrandSids()!=null){
qw.like("r.goodsSpuSid",query.getBrandSids());
if(query.getGoodsSids()!=null){
if(query.getGoodsSids().size()!=0){
qw.in("r.goodsSpuSid",query.getGoodsSids());
}
}
qw.apply(StringUtils.isNotBlank(query.getCount()), "r.count >= '" + query.getCount() + "'");
qw.eq("r.billType", "0");
qw.groupBy("r.goodsSpuSid");
qw.groupBy("r.goodsSkuSid");
qw.eq("r.createOrgSid",query.getOrgPath());
IPage<WarehouseInventoryRecord> page = PagerUtil.queryToPage(pq);
IPage<WarehouseGoodsSalesReportVo> pagging = baseMapper.goodsSales(page, qw);
@@ -282,14 +286,18 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
qw.eq("r.supplierSid",query.getSupplierSid());
}
if(query.getTypeSids()!=null){
qw.in("r.goodsSpuSid",query.getTypeSids());
if(query.getTypeSids().size()!=0){
qw.in("r.goodsSpuSid",query.getTypeSids());
}
}
if(query.getBrandSids()!=null){
qw.like("r.goodsSpuSid",query.getBrandSids());
if(query.getGoodsSids()!=null){
if(query.getGoodsSids().size()!=0){
qw.in("r.goodsSpuSid",query.getGoodsSids());
}
}
qw.apply(StringUtils.isNotBlank(query.getCount()), "r.count >= '" + query.getCount() + "'");
qw.eq("r.billType", "0");
qw.groupBy("r.goodsSpuSid");
qw.groupBy("r.goodsSkuSid");
qw.eq("r.createOrgSid",query.getOrgPath());
List<WarehouseGoodsSalesReportExcelVo> pagging = baseMapper.goodsSalesE(qw);
@@ -317,7 +325,7 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
qw.eq("d.goodsTypeSid",query.getTypeSid());
}
qw.eq("r.billType", "1");
qw.groupBy("r.goodsSpuSid");
qw.groupBy("r.goodsSkuSid");
qw.eq("r.createOrgSid",query.getOrgPath());
List<WarehouseGoodsPurchaseReportExcelVo> pagging = baseMapper.goodsPurchaseE(qw);
@@ -331,14 +339,14 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
apply(StringUtils.isNotBlank(query.getEndDate()), "r.createTime <= '" + query.getEndDate() + "'"
);
if(query.getSids()!=null){
qw.in("customerSid",query.getSids());
qw.in("r.customerSid",query.getSids());
}
if(StringUtils.isNotBlank(query.getCustomerName())){
qw.like("customerName",query.getCustomerName());
qw.like("r.customerName",query.getCustomerName());
}
qw.eq("r.billType", "0");
qw.groupBy("r.customerSid");
qw.eq("createOrgSid",query.getOrgPath());
qw.eq("r.createOrgSid",query.getOrgPath());
List<WarehouseCustomerOutReportExcelVo> pagging = baseMapper.customerSalesE(qw);
return pagging;
}

3
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseInventoryCountReportQuery.java
View File

@@ -18,7 +18,9 @@ public class WarehouseInventoryCountReportQuery implements Query {
private String endDate;
private String orgPath;
private String customerName;
private String customerSid;
private List<String> sids;
private List<String> goodsSids;
private String warehouseSid;
private String goodsSid;
private String supplierSid;
@@ -27,4 +29,5 @@ public class WarehouseInventoryCountReportQuery implements Query {
private List<String> typeSids;
private List<String> brandSids;
private String count;
private String state;
}

2
src/main/java/com/yxt/warehouse/biz/warehouseinvoice/WarehouseInvoiceMapper.xml
View File

@@ -6,7 +6,7 @@
<select id="details" resultType="com.yxt.warehouse.biz.warehouseinvoice.WarehouseInvoiceVo">
select a.*,
case a.invoiceType when 1 then '普通发票' end as invoiceTypeValue,
case a.invoiceType when 001 then '增值税专用发票' when 002 then '增值税普通发票' end as invoiceTypeValue,
case a.contentType when 1 then '发票商品' when 2 then '2自定义明细' end as contentTypeValue
from warehouse_invoice a
<where>

4
src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java
View File

@@ -382,7 +382,7 @@ public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBill
warehouseInventoryRecordDto.setUnit(warehouseInventory.getUnit());
warehouseInventoryRecordDto.setCurrentCount(StringUtils.isNotBlank(warehouseInventory.getCount().toString()) ? new BigDecimal(warehouseInventory.getCount().toString()) : BigDecimal.ZERO);
warehouseInventoryRecordDto.setCount(dto.getCount());
warehouseInventoryRecordDto.setWarehouseSid(warehouseOutLocation.getWarehouseSid());
warehouseInventoryRecordDto.setWarehouseSid(warehouseInventory.getWarehouseSid());
warehouseInventoryRecordDto.setWarehouseName(warehouseInventory.getWarehouseName());
warehouseInventoryRecordDto.setWarehouseRackSid(warehouseOutLocation.getRackSid());
warehouseInventoryRecordDto.setWarehouseRackCode(warehouseOutLocation.getRackCode());
@@ -393,6 +393,8 @@ public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBill
warehouseInventoryRecordDto.setCreateOrgSid(dto.getCreateOrgSid());
warehouseInventoryRecordDto.setAmount((dto.getCount().multiply(dto.getCost())));
warehouseInventoryRecordDto.setPreBillNo(WarehouseOutBill.getBillNo());
warehouseInventoryRecordDto.setManufacturerSid(warehouseInventory.getManufacturerSid());
warehouseInventoryRecordDto.setManufacturerName(warehouseInventory.getManufacturerName());
warehouseInventoryRecordService.saveOrUpdateDto(warehouseInventoryRecordDto);
}
}