|
|
@@ -34,6 +34,7 @@ import com.zfire.mall.manager.enums.OrderTypeStatusEnum;
|
|
|
import com.zfire.mall.manager.exception.RemoteServiceException;
|
|
|
import com.zfire.mall.manager.logic.common.CommonLogic;
|
|
|
import com.zfire.mall.manager.logic.customer.CustomerProductTypeLogic;
|
|
|
+import com.zfire.mall.manager.logic.front.CustomerFrontLogic;
|
|
|
import com.zfire.mall.manager.logic.invoice.InvoiceLogic;
|
|
|
import com.zfire.mall.manager.logic.k3.K3CustomerLogic;
|
|
|
import com.zfire.mall.manager.logic.k3.K3GeJiangLogic;
|
|
|
@@ -122,6 +123,9 @@ public class SaleOrderLogic {
|
|
|
K3CustomerLogic k3CustomerLogic;
|
|
|
|
|
|
@Autowired
|
|
|
+ CustomerStockService customerStockService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
SalesOutStockLogic salesOutStockLogic;
|
|
|
|
|
|
@Autowired
|
|
|
@@ -190,6 +194,8 @@ public class SaleOrderLogic {
|
|
|
@Autowired
|
|
|
RetailOrderService retailOrderService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ CustomerFrontLogic customerFrontLogic;
|
|
|
|
|
|
|
|
|
final static String orgId = "1";
|
|
|
@@ -289,48 +295,48 @@ public class SaleOrderLogic {
|
|
|
|
|
|
for (InvoiceApplicationOrder order : detail.getSaleOrderData()) {
|
|
|
|
|
|
- Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.INVOICE_APPLICATION+order.getOrderId());
|
|
|
+ Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.INVOICE_APPLICATION + order.getOrderId());
|
|
|
try {
|
|
|
if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
|
|
|
throw new RemoteServiceException("系统繁忙，请稍后再试");
|
|
|
}
|
|
|
|
|
|
- //记录台账记录
|
|
|
- String customerWalletId = null;
|
|
|
- if (order.getOrderType().equals("RETAIL") || order.getOrderType().equals("RETAIL_POLICY")) {
|
|
|
- RetailOrderItem retailOrderItem = retailOrderItemService.getById(order.getOrderId());
|
|
|
- retailOrderItem.setHasSendQty(retailOrderItem.getHasSendQty() + order.getRefundableQty());
|
|
|
+ //记录台账记录
|
|
|
+ String customerWalletId = null;
|
|
|
+ if (order.getOrderType().equals("RETAIL") || order.getOrderType().equals("RETAIL_POLICY")) {
|
|
|
+ RetailOrderItem retailOrderItem = retailOrderItemService.getById(order.getOrderId());
|
|
|
+ retailOrderItem.setHasSendQty(retailOrderItem.getHasSendQty() + order.getRefundableQty());
|
|
|
|
|
|
- if (retailOrderItem.getQty() < retailOrderItem.getHasSendQty())
|
|
|
- throw new RemoteServiceException("出库数量大于了订单数量");
|
|
|
+ if (retailOrderItem.getQty() < retailOrderItem.getHasSendQty())
|
|
|
+ throw new RemoteServiceException("出库数量大于了订单数量");
|
|
|
|
|
|
- retailOrderItem.updateById();
|
|
|
- customerWalletId = retailOrderItem.getCustomerWalletId();
|
|
|
- }
|
|
|
+ retailOrderItem.updateById();
|
|
|
+ customerWalletId = retailOrderItem.getCustomerWalletId();
|
|
|
+ }
|
|
|
|
|
|
- if (order.getOrderType().equals("TRADE") || order.getOrderType().equals("HOME")) {
|
|
|
- EnginOrderItem enginOrderItem = enginOrderItemService.getById(order.getOrderId());
|
|
|
- enginOrderItem.setHasSendQty(enginOrderItem.getHasSendQty() + order.getRefundableQty());
|
|
|
+ if (order.getOrderType().equals("TRADE") || order.getOrderType().equals("HOME")) {
|
|
|
+ EnginOrderItem enginOrderItem = enginOrderItemService.getById(order.getOrderId());
|
|
|
+ enginOrderItem.setHasSendQty(enginOrderItem.getHasSendQty() + order.getRefundableQty());
|
|
|
|
|
|
- if (enginOrderItem.getQty() < enginOrderItem.getHasSendQty())
|
|
|
- throw new RemoteServiceException("出库数量大于了订单数量");
|
|
|
+ if (enginOrderItem.getQty() < enginOrderItem.getHasSendQty())
|
|
|
+ throw new RemoteServiceException("出库数量大于了订单数量");
|
|
|
|
|
|
|
|
|
- if (order.getOrderType().equals("TRADE")) {
|
|
|
- EnginInfoOrderItem one = enginInfoOrderItemService.lambdaQuery().eq(EnginInfoOrderItem::getEnginInfoNo, enginOrderItem.getRefEnginRecordNo())
|
|
|
- .eq(EnginInfoOrderItem::getSaleTypeId, enginOrderItem.getSaleTypeId())
|
|
|
- .eq(EnginInfoOrderItem::getMaterialNumber, enginOrderItem.getMaterialNumber())
|
|
|
- .one();
|
|
|
+ if (order.getOrderType().equals("TRADE")) {
|
|
|
+ EnginInfoOrderItem one = enginInfoOrderItemService.lambdaQuery().eq(EnginInfoOrderItem::getEnginInfoNo, enginOrderItem.getRefEnginRecordNo())
|
|
|
+ .eq(EnginInfoOrderItem::getSaleTypeId, enginOrderItem.getSaleTypeId())
|
|
|
+ .eq(EnginInfoOrderItem::getMaterialNumber, enginOrderItem.getMaterialNumber())
|
|
|
+ .one();
|
|
|
|
|
|
- if (one != null) {
|
|
|
- one.setHasDeliverQty(one.getHasDeliverQty() + order.getRefundableQty());
|
|
|
- one.updateById();
|
|
|
+ if (one != null) {
|
|
|
+ one.setHasDeliverQty(one.getHasDeliverQty() + order.getRefundableQty());
|
|
|
+ one.updateById();
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- enginOrderItem.updateById();
|
|
|
- customerWalletId = enginOrderItem.getCustomerWalletId();
|
|
|
- }
|
|
|
+ enginOrderItem.updateById();
|
|
|
+ customerWalletId = enginOrderItem.getCustomerWalletId();
|
|
|
+ }
|
|
|
|
|
|
} finally {
|
|
|
obtain.unlock();
|
|
|
@@ -363,12 +369,57 @@ public class SaleOrderLogic {
|
|
|
salesOrder.setApprovalName(adminUser.getNickName());
|
|
|
salesOrder.setApprovalTime(new Date());
|
|
|
salesOrder.updateById();
|
|
|
+
|
|
|
+ this.addCustStock(detail);
|
|
|
}
|
|
|
|
|
|
invoiceMapper.updateStatus(salesOrder.getOrderNo());
|
|
|
saleOrderMapper.updateInvoice(salesOrder.getId());
|
|
|
}
|
|
|
|
|
|
+ private void addCustStock(SaleOrderBody detail) {
|
|
|
+ List<SalesOrderItem> salesOrderItems = salesOrderItemService.lambdaQuery().eq(SalesOrderItem::getSalesOrderNo, detail.getId()).list();
|
|
|
+ for (SalesOrderItem salesOrderItem : salesOrderItems) {
|
|
|
+
|
|
|
+
|
|
|
+ customerFrontLogic.stockAcc(true, Convert.toInt(salesOrderItem.getRefundableQty()), detail.getId(),
|
|
|
+ "审批出库单增加商家库存", salesOrderItem.getMaterialId(), detail.getCustomerId(), detail.getRemark());
|
|
|
+
|
|
|
+
|
|
|
+ CustomerStock customerStock = customerStockService.lambdaQuery()
|
|
|
+ .eq(CustomerStock::getCustomerId, detail.getCustomerId())
|
|
|
+ .eq(CustomerStock::getMaterialCode, salesOrderItem.getMaterialCode())
|
|
|
+ .last("limit 1").one();
|
|
|
+
|
|
|
+ if (customerStock != null) {
|
|
|
+
|
|
|
+ customerStock.setStockNum(customerStock.getStockNum().add(Convert.toBigDecimal(salesOrderItem.getRefundableQty())));
|
|
|
+ customerStock.updateById();
|
|
|
+ } else {
|
|
|
+
|
|
|
+
|
|
|
+ customerStock = new CustomerStock();
|
|
|
+ customerStock.setCustomerId(detail.getCustomerId());
|
|
|
+ customerStock.setCustomerName(detail.getCustomerName());
|
|
|
+ customerStock.setCustomerNumber(detail.getCustomerNumber());
|
|
|
+ customerStock.setMaterialCode(salesOrderItem.getMaterialCode());
|
|
|
+ customerStock.setMaterialId(salesOrderItem.getMaterialId());
|
|
|
+ customerStock.setMaterialName(salesOrderItem.getMaterialName());
|
|
|
+ customerStock.setMaterialOldNumber(salesOrderItem.getMaterialOldNumber());
|
|
|
+ customerStock.setSpecification(salesOrderItem.getSpecification());
|
|
|
+ customerStock.setCategoryId(salesOrderItem.getK3CategoryId());
|
|
|
+ customerStock.setCategoryName(salesOrderItem.getK3CategoryName());
|
|
|
+ customerStock.setCategoryNumber(salesOrderItem.getK3CategoryNumber());
|
|
|
+
|
|
|
+ customerStock.setStockNum(Convert.toBigDecimal(salesOrderItem.getRefundableQty()));
|
|
|
+ customerStock.insert();
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
private void checkApproval(List<SaleOrderData> orders, String correspondId, String status) throws Exception {
|
|
|
for (SaleOrderData order : orders) {
|
|
|
@@ -439,7 +490,7 @@ public class SaleOrderLogic {
|
|
|
*/
|
|
|
public ExcelData export(List<SaleOrderBean> saleOrderBeanList) {
|
|
|
String[] titles = new String[]{"状态", "打印时间", "发票号码", "出库单号", "发货单号", "订单号", "仓库",
|
|
|
- "经销商编码", "经销商名称", "销售类型", "物料编码", "厂产品代码", "产品名称", "规格型号", "存货类别", "单位", "数量", "单价", "订单金额", "表头备注", "表体备注", "业务员", "表头业务员", "审核时间","金蝶部门"};
|
|
|
+ "经销商编码", "经销商名称", "销售类型", "物料编码", "厂产品代码", "产品名称", "规格型号", "存货类别", "单位", "数量", "单价", "订单金额", "表头备注", "表体备注", "业务员", "表头业务员", "审核时间", "金蝶部门"};
|
|
|
List<List<Object>> rows = new ArrayList<>();
|
|
|
for (SaleOrderBean saleOrderBean : saleOrderBeanList) {
|
|
|
List<Object> row = new ArrayList<>();
|
|
|
@@ -594,7 +645,7 @@ public class SaleOrderLogic {
|
|
|
|
|
|
public ExcelData exportChuKu(List<SaleOrderBean> records) {
|
|
|
String[] titles = new String[]{"状态", "打印时间", "订单类型", "出库单号", "发货单号", "订单号", "仓库",
|
|
|
- "经销商编码", "经销商名称", "物料编码", "厂产品代码", "产品名称", "规格型号", "存货类别", "单位", "审核人", "审核时间","数量","金蝶部门"};
|
|
|
+ "经销商编码", "经销商名称", "物料编码", "厂产品代码", "产品名称", "规格型号", "存货类别", "单位", "审核人", "审核时间", "数量", "金蝶部门"};
|
|
|
List<List<Object>> rows = new ArrayList<>();
|
|
|
for (SaleOrderBean saleOrderBean : records) {
|
|
|
List<Object> row = new ArrayList<>();
|
|
|
@@ -628,19 +679,19 @@ public class SaleOrderLogic {
|
|
|
return excelData;
|
|
|
}
|
|
|
|
|
|
- public IPage<StorageFeeBean> listStorageFee(List<String> categoryNum,String approvalStartTime, String approvalEndTime, String saleExamineStatus, String saleStartTime, String saleEndTime, String invoiceStartTime, String invoiceEndTime, String mainOrderId, List<String> id, List<String> orderNo, String materialNumber, String customerName,
|
|
|
+ public IPage<StorageFeeBean> listStorageFee(List<String> categoryNum, String approvalStartTime, String approvalEndTime, String saleExamineStatus, String saleStartTime, String saleEndTime, String invoiceStartTime, String invoiceEndTime, String mainOrderId, List<String> id, List<String> orderNo, String materialNumber, String customerName,
|
|
|
List<String> correspondId, String specification, String materialName, String customerNumber, String startTime, String endTime, Integer pageNum,
|
|
|
Integer pageSize) {
|
|
|
|
|
|
AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
|
String customerId = adminUser.getIsCustomer() ? adminUser.getCustomerNumber() : customerNumber;
|
|
|
|
|
|
- Integer count = saleOrderMapper.listStorageFeeCount(categoryNum,approvalStartTime, approvalEndTime,
|
|
|
+ Integer count = saleOrderMapper.listStorageFeeCount(categoryNum, approvalStartTime, approvalEndTime,
|
|
|
saleExamineStatus, saleStartTime, saleEndTime, invoiceStartTime, invoiceEndTime, mainOrderId, id, materialNumber, orderNo,
|
|
|
customerName, correspondId, specification, materialName, customerId, startTime, endTime, adminUser.getServiceIds(),
|
|
|
adminUser.getAdminUserId(), adminUser.getK3CategoryIds());
|
|
|
|
|
|
- IPage<StorageFeeBean> list = saleOrderMapper.listStorageFee(new Page<>(pageNum, pageSize,false),categoryNum, approvalStartTime, approvalEndTime,
|
|
|
+ IPage<StorageFeeBean> list = saleOrderMapper.listStorageFee(new Page<>(pageNum, pageSize, false), categoryNum, approvalStartTime, approvalEndTime,
|
|
|
saleExamineStatus, saleStartTime, saleEndTime, invoiceStartTime, invoiceEndTime, mainOrderId, id, materialNumber, orderNo,
|
|
|
customerName, correspondId, specification, materialName, customerId, startTime, endTime, adminUser.getServiceIds(),
|
|
|
adminUser.getAdminUserId(), adminUser.getK3CategoryIds());
|
|
|
@@ -655,15 +706,15 @@ public class SaleOrderLogic {
|
|
|
List<String> mainOrderIds = list.getRecords().stream().map(StorageFeeBean::getMainOrderId).collect(Collectors.toList());
|
|
|
|
|
|
List<InvoiceApplicationOrder> listInvoice = invoiceApplicationOrderService.lambdaQuery()
|
|
|
- .in(InvoiceApplicationOrder::getOrderId,collect1)
|
|
|
+ .in(InvoiceApplicationOrder::getOrderId, collect1)
|
|
|
.select(InvoiceApplicationOrder::getOrderId, InvoiceApplicationOrder::getRefundableQty).list();
|
|
|
|
|
|
List<RetailOrder> retailOrderItems = retailOrderService.lambdaQuery()
|
|
|
- .select(RetailOrder::getId,RetailOrder::getExamineTime)
|
|
|
+ .select(RetailOrder::getId, RetailOrder::getExamineTime)
|
|
|
.in(RetailOrder::getId, mainOrderIds).list();
|
|
|
|
|
|
List<EnginOrder> enginOrderList = enginOrderService.lambdaQuery()
|
|
|
- .select(EnginOrder::getEnginOrderNo,EnginOrder::getConfirmTime,EnginOrder::getRefUseUnit)
|
|
|
+ .select(EnginOrder::getEnginOrderNo, EnginOrder::getConfirmTime, EnginOrder::getRefUseUnit)
|
|
|
.in(EnginOrder::getEnginOrderNo, mainOrderIds).list();
|
|
|
|
|
|
for (StorageFeeBean record : list.getRecords()) {
|
|
|
@@ -679,17 +730,16 @@ public class SaleOrderLogic {
|
|
|
.filter(item -> item.getEnginOrderNo().equals(record.getMainOrderId()))
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
- if (!CollectionUtils.isEmpty(retailOrderList)){
|
|
|
+ if (!CollectionUtils.isEmpty(retailOrderList)) {
|
|
|
RetailOrder retailOrder = retailOrderList.get(0);
|
|
|
- record.setExamineTime(DateUtil.format(retailOrder.getExamineTime(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
- }else {
|
|
|
+ record.setExamineTime(DateUtil.format(retailOrder.getExamineTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ } else {
|
|
|
EnginOrder enginOrder = enginOrders.get(0);
|
|
|
- record.setExamineTime(DateUtil.format(enginOrder.getConfirmTime(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ record.setExamineTime(DateUtil.format(enginOrder.getConfirmTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
record.setRefUseUnit(enginOrder.getRefUseUnit());
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
record.setSendQty(record.getQty() - collect.stream().mapToInt(InvoiceApplicationOrder::getRefundableQty).sum());
|
|
|
|
|
|
/*
|
|
|
@@ -712,11 +762,11 @@ public class SaleOrderLogic {
|
|
|
record.setEndCalculationTime(record.getSalesApprovalTime());
|
|
|
if (record.getEndCalculationTime() == null || StringUtils.isEmpty(record.getSalesExamineStatus()) || !record.getSalesExamineStatus().equals(ExamineStatusEnum.OK.toString()))
|
|
|
continue;
|
|
|
- if ( DateUtil.parse(DateUtil.format(record.getStartCalculationTime(), "yyyy-MM-dd"))
|
|
|
- .compareTo(DateUtil.parse(DateUtil.format(record.getEndCalculationTime(), "yyyy-MM-dd"),"yyyy-MM-dd")) > 0 )
|
|
|
+ if (DateUtil.parse(DateUtil.format(record.getStartCalculationTime(), "yyyy-MM-dd"))
|
|
|
+ .compareTo(DateUtil.parse(DateUtil.format(record.getEndCalculationTime(), "yyyy-MM-dd"), "yyyy-MM-dd")) > 0)
|
|
|
continue;
|
|
|
- record.setCalculationDays(Convert.toInt(DateUtil.between( DateUtil.parse(DateUtil.format(record.getStartCalculationTime(), "yyyy-MM-dd"),"yyyy-MM-dd")
|
|
|
- , DateUtil.parse(DateUtil.format(record.getEndCalculationTime(), "yyyy-MM-dd"),"yyyy-MM-dd"), DateUnit.DAY)) + 1);
|
|
|
+ record.setCalculationDays(Convert.toInt(DateUtil.between(DateUtil.parse(DateUtil.format(record.getStartCalculationTime(), "yyyy-MM-dd"), "yyyy-MM-dd")
|
|
|
+ , DateUtil.parse(DateUtil.format(record.getEndCalculationTime(), "yyyy-MM-dd"), "yyyy-MM-dd"), DateUnit.DAY)) + 1);
|
|
|
if (record.getCalculationDays() > 0) {
|
|
|
record.setWarehouseRent((record.getCalculationDays() < 15 ?
|
|
|
record.getShipmentAmount().multiply(Constant.STORAGE_FEE_ONE) : record.getShipmentAmount().multiply(Constant.STORAGE_FEE_TWO))
|
|
|
@@ -728,10 +778,10 @@ public class SaleOrderLogic {
|
|
|
}
|
|
|
|
|
|
public ExcelData listStorageFeeExport(List<StorageFeeBean> records) {
|
|
|
- String[] titles = new String[]{"订单类型", "订单号", "订单日期", "订单审核时间", "预留单日期", "预留单号", "发货单号","使用单位",
|
|
|
+ String[] titles = new String[]{"订单类型", "订单号", "订单日期", "订单审核时间", "预留单日期", "预留单号", "发货单号", "使用单位",
|
|
|
"发货单日期", "发货单审核时间", "出库状态", "出库审核时间", "出库审核人", "仓库", "客户编码", "客户名称",
|
|
|
- "存货编码", "规格型号", "订单数量", "价税合计", "返利金额","格力折扣额", "合计", "发货数量", "钱包", "钱包对应业务", "金蝶部门", "发货金额", "起算日期", "结算日期",
|
|
|
- "计算天数", "仓租金额","存货类别"};
|
|
|
+ "存货编码", "规格型号", "订单数量", "价税合计", "返利金额", "格力折扣额", "合计", "发货数量", "钱包", "钱包对应业务", "金蝶部门", "发货金额", "起算日期", "结算日期",
|
|
|
+ "计算天数", "仓租金额", "存货类别"};
|
|
|
List<List<Object>> rows = new ArrayList<>();
|
|
|
for (StorageFeeBean storageFeeBean : records) {
|
|
|
List<Object> row = new ArrayList<>();
|
|
|
@@ -739,7 +789,7 @@ public class SaleOrderLogic {
|
|
|
row.add(storageFeeBean.getMainOrderId());
|
|
|
row.add(storageFeeBean.getTheTime());
|
|
|
row.add(storageFeeBean.getExamineTime());
|
|
|
- row.add(DateUtil.format(storageFeeBean.getReservedCreateTime(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ row.add(DateUtil.format(storageFeeBean.getReservedCreateTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
row.add(storageFeeBean.getReservedId());
|
|
|
row.add(storageFeeBean.getInvoiceId());
|
|
|
row.add(storageFeeBean.getRefUseUnit());
|
|
|
@@ -1218,29 +1268,29 @@ public class SaleOrderLogic {
|
|
|
purchaseInStockBean.setSupplier(InvoiceCustomerEnum.GEJIANG_FOSHAN_SUPPLIER.getCode());
|
|
|
|
|
|
//芦苞佛山
|
|
|
- if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_LUBAOFOSHAN_STOCK.getCode())) {
|
|
|
- purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
- //三水佛山
|
|
|
- } else if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_SANSHUIFOSHAN_STOCK.getCode())) {
|
|
|
- purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
- //三水珠海佛山
|
|
|
- } else if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_SHANSHUIZHUHAIFOSHAN_STOCK.getCode())) {
|
|
|
- purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
- //三水珠海仓
|
|
|
- } else if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_SANSHUIFOSHANZHUHAI_STOCK.getCode())) {
|
|
|
- purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
- //芦苞仓
|
|
|
- } else if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_LUBAO_STOCK.getCode())) {
|
|
|
- purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
-
|
|
|
- } else if (invoiceApplication.getCorrespondName().equals("三水仓")) {
|
|
|
- purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
- } else if (invoiceApplication.getCorrespondName().equals("虚拟仓")) {
|
|
|
- purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
- }else {
|
|
|
-
|
|
|
- purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
- }
|
|
|
+ if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_LUBAOFOSHAN_STOCK.getCode())) {
|
|
|
+ purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
+ //三水佛山
|
|
|
+ } else if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_SANSHUIFOSHAN_STOCK.getCode())) {
|
|
|
+ purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
+ //三水珠海佛山
|
|
|
+ } else if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_SHANSHUIZHUHAIFOSHAN_STOCK.getCode())) {
|
|
|
+ purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
+ //三水珠海仓
|
|
|
+ } else if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_SANSHUIFOSHANZHUHAI_STOCK.getCode())) {
|
|
|
+ purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
+ //芦苞仓
|
|
|
+ } else if (invoiceApplication.getCorrespondName().equals(InvoiceCustomerEnum.GEJIANG_LUBAO_STOCK.getCode())) {
|
|
|
+ purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
+
|
|
|
+ } else if (invoiceApplication.getCorrespondName().equals("三水仓")) {
|
|
|
+ purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
+ } else if (invoiceApplication.getCorrespondName().equals("虚拟仓")) {
|
|
|
+ purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
+ } else {
|
|
|
+
|
|
|
+ purchaseInStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
purchaseInStockBean.setDate(DateUtil.formatDate(invoiceApplication.getCreateTime()));
|
|
|
@@ -1307,7 +1357,7 @@ public class SaleOrderLogic {
|
|
|
invoiceApplication.setGejiangSync(1);
|
|
|
invoiceApplication.setGejiangSyncRemark(null);
|
|
|
invoiceApplication.updateById();
|
|
|
- } else{
|
|
|
+ } else {
|
|
|
|
|
|
List<InvoiceApplicationOrder> invoiceApplicationOrders = invoiceApplicationOrderService.lambdaQuery().eq(InvoiceApplicationOrder::getInvoiceId, invoiceApplicationSyncGejiang.getInvoiceId()).list();
|
|
|
InvoiceApplication invoiceApplication = invoiceApplicationService.getById(invoiceApplicationSyncGejiang.getInvoiceId());
|
|
|
@@ -1317,8 +1367,8 @@ public class SaleOrderLogic {
|
|
|
|
|
|
SalesOrder salesOrderOne = salesOrderService.getById(salesOrder.getSalesOrderNo());
|
|
|
|
|
|
- if (salesOrderOne != null){
|
|
|
- correspondName = salesOrderOne.getCorrespondName();
|
|
|
+ if (salesOrderOne != null) {
|
|
|
+ correspondName = salesOrderOne.getCorrespondName();
|
|
|
}
|
|
|
|
|
|
PurchaseOutStockBean purchaseOutStockBean = new PurchaseOutStockBean();
|
|
|
@@ -1391,7 +1441,7 @@ public class SaleOrderLogic {
|
|
|
purchaseOutStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_SANSHUI_NUMBER.getCode());
|
|
|
} else if (invoiceApplication.getCorrespondName().equals("虚拟仓")) {
|
|
|
purchaseOutStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
|
|
|
purchaseOutStockBean.setStock(InvoiceCustomerEnum.GEJIANG_GUANGZHOU_STOCK_LUBAO_NUMBER.getCode());
|
|
|
}
|
|
|
@@ -1430,7 +1480,7 @@ public class SaleOrderLogic {
|
|
|
k3Item.setPriceUnit(objects.get(0).getBaseUnitCode());
|
|
|
k3Item.setRemainInStockUnit(objects.get(0).getBaseUnitCode());
|
|
|
k3Item.setStock(purchaseOutStockBean.getStock());
|
|
|
- k3Item.setFRmrealqty(new BigDecimal(item.getRefundableQty()*-1));
|
|
|
+ k3Item.setFRmrealqty(new BigDecimal(item.getRefundableQty() * -1));
|
|
|
k3Item.setPrice(item.getSinglePayPrice().divide(new BigDecimal("1.13"), 6, BigDecimal.ROUND_HALF_UP).setScale(6, BigDecimal.ROUND_UP));
|
|
|
k3Item.setFTaxPrice(item.getSinglePayPrice());
|
|
|
k3Item.setFAllAmount(item.getPayAmount());
|
|
|
@@ -1752,14 +1802,13 @@ public class SaleOrderLogic {
|
|
|
.stream().map(AdminUserStock::getCorrespondId).distinct().collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
-
|
|
|
zfireParamBean = FieldUtils.supplyParam(zfireParamBean);
|
|
|
|
|
|
|
|
|
Integer count = saleOrderMapper.listCountV2(zfireParamBean, customerId, adminUser.getServiceIds(), collect, adminUser.getK3CategoryIds());
|
|
|
|
|
|
|
|
|
- IPage<SaleOrderVO> stockBeanToDayIPage = saleOrderMapper.listV2(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize(),count,false), zfireParamBean
|
|
|
+ IPage<SaleOrderVO> stockBeanToDayIPage = saleOrderMapper.listV2(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize(), count, false), zfireParamBean
|
|
|
, customerId, adminUser.getServiceIds(), collect, adminUser.getK3CategoryIds());
|
|
|
|
|
|
return stockBeanToDayIPage;
|
|
|
@@ -1773,14 +1822,13 @@ public class SaleOrderLogic {
|
|
|
.stream().map(AdminUserStock::getCorrespondId).distinct().collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
-
|
|
|
zfireParamBean = FieldUtils.supplyParam(zfireParamBean);
|
|
|
|
|
|
|
|
|
Integer count = saleOrderMapper.listCountV2(zfireParamBean, customerId, adminUser.getServiceIds(), collect, adminUser.getK3CategoryIds());
|
|
|
|
|
|
|
|
|
- IPage<SaleOrderVOV> stockBeanToDayIPage = saleOrderMapper.listV3(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize(),count,false), zfireParamBean
|
|
|
+ IPage<SaleOrderVOV> stockBeanToDayIPage = saleOrderMapper.listV3(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize(), count, false), zfireParamBean
|
|
|
, customerId, adminUser.getServiceIds(), collect, adminUser.getK3CategoryIds());
|
|
|
|
|
|
return stockBeanToDayIPage;
|
‘linchangsheng’