2024年4月23日17:29:21

blade-service/blade-data/src/main/java/org/springblade/data/michelinApi/service/impl/MichelinServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.data.michelinApi.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import io.seata.spring.annotation.GlobalTransactional;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -15,7 +15,6 @@ import org.springblade.data.michelinApi.dto.SalesOrderDto;
 import org.springblade.data.michelinApi.dto.SalesOrderR;
 import org.springblade.data.michelinApi.service.IMichelinService;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -68,7 +67,9 @@ public class MichelinServiceImpl implements IMichelinService {
 							order.setUom(item.getUom());
 							order.setQuantity(item.getQuantity());
 							order.setUnitPrice(item.getUnitPrice());
-							externalOrderList.add(order);
+							if (ObjectUtils.isNotNull(order.getSalesOrderStatus()) && "complete".equals(order.getSalesOrderStatus())) {
+								externalOrderList.add(order);
+							}
 						}
 						res = externalOrderService.saveBatch(externalOrderList);
 					}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -1711,7 +1711,7 @@ ORDER BY
         SELECT
             BO.charge_member as chargeMember,
             SUM( bdf.delivery_amount ) AS arrivalAmount,
-            SUM( bdf.actual_quantity ) AS quantity,
+            SUM( BOI.quantity ) AS quantity,
             SUM(BO.debit_amount) AS amount,
             SUM(BOI.purchaseAmount) AS purchaseAmount,
             SUM(BO.this_used_profit) AS thisUsedProfit,
@@ -1836,7 +1836,7 @@ ORDER BY
         SELECT
         BO.charge_member as chargeMember,
         SUM( bdf.delivery_amount ) AS arrivalAmount,
-        SUM( bdf.actual_quantity ) AS quantity,
+        SUM( BOI.quantity ) AS quantity,
         SUM(BO.debit_amount) AS amount,
         SUM(BOI.purchaseAmount) AS purchaseAmount,
         SUM(BO.this_used_profit) AS thisUsedProfit,
@@ -1907,7 +1907,7 @@ ORDER BY
             BCD.cname AS corpName,
             SUM( bdf.delivery_amount ) AS arrivalAmount,
             SUM( BO.debit_amount ) AS amount,
-            SUM( bdf.actual_quantity ) AS quantity,
+            SUM( BOI.quantity ) AS quantity,
             SUM( BOI.purchaseAmount ) AS purchaseAmount,
             SUM( BO.this_used_profit ) AS thisUsedProfit,
             SUM( BO.debit_amount ) - SUM( BOI.purchaseAmount ) AS grossProfit,
@@ -2046,7 +2046,7 @@ ORDER BY
         BCD.cname AS corpName,
         SUM( bdf.delivery_amount ) AS arrivalAmount,
         SUM( BO.debit_amount ) AS amount,
-        SUM( bdf.actual_quantity ) AS quantity,
+        SUM( BOI.quantity ) AS quantity,
         SUM( BOI.purchaseAmount ) AS purchaseAmount,
         SUM( BO.this_used_profit ) AS thisUsedProfit,
         SUM( BO.debit_amount ) - SUM( BOI.purchaseAmount ) AS grossProfit,
@@ -2114,7 +2114,7 @@ ORDER BY
             BGD.brand AS brand,
             SUM( bdf.delivery_amount ) AS arrivalAmount,
             SUM( BO.debit_amount ) AS amount,
-            SUM( bdf.actual_quantity ) AS quantity,
+            SUM( BOI.quantity ) AS quantity,
             SUM( BOI.purchaseAmount ) AS purchaseAmount,
             SUM( BO.this_used_profit ) AS thisUsedProfit,
             FORMAT(( SUM( BO.debit_amount ) / SUM( BOI.quantity ) ),2) AS price,
@@ -2231,7 +2231,7 @@ ORDER BY
         BGD.brand AS brand,
         SUM( bdf.delivery_amount ) AS arrivalAmount,
         SUM( BO.debit_amount ) AS amount,
-        SUM( bdf.actual_quantity ) AS quantity,
+        SUM( BOI.quantity ) AS quantity,
         SUM( BOI.purchaseAmount ) AS purchaseAmount,
         SUM( BO.this_used_profit ) AS thisUsedProfit,
         FORMAT(( SUM( BO.debit_amount ) / SUM( BOI.quantity ) ),2) AS price,

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -368,7 +368,7 @@
         ps.storage_id as stockId,
         ps.ord_no AS billno,
         ps.status AS statusName,
-        ps.update_time AS updateTime,
+        ps.create_time AS updateTime,
         pgd.brand_item AS brandItem,
         pgd.cname AS goodsName,
         pgd.specification_and_model AS specificationAndModel,

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/mapper/ShipMapper.xml

@@ -52,7 +52,7 @@
         ps.billno AS billno,
         ps.customer_name AS corpName,
         ps.status_name AS statusName,
-        ps.update_time AS updateTime,
+        ps.create_time AS updateTime,
         pgd.brand_item AS brandItem,
         pgd.cname AS goodsName,
         pgd.specification_and_model AS specificationAndModel,

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -113,7 +113,12 @@ public class StockDescController extends BladeController {
 				pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
 					.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 					.eq(PjGoodsDesc::getIsDeleted, 0)
-					.and(i -> i.like(PjGoodsDesc::getCname, cname).or().like(PjGoodsDesc::getCnameInt, cname)));
+					.eq(PjGoodsDesc::getBrandName, brandName)
+					.and(i -> i.like(PjGoodsDesc::getCname, cname)
+						.or().like(PjGoodsDesc::getCnameInt, cname))
+					.or().like(PjGoodsDesc::getCname, stockDesc.getCname())
+					.or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())
+				);
 				lambdaQueryWrapper.like(PjStockDesc::getBrandName, brandName);
 			} else {
 				String[] chineseWords = stockDesc.getCname().split("[^一-龥]");
@@ -122,8 +127,13 @@ public class StockDescController extends BladeController {
 					pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
 						.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 						.eq(PjGoodsDesc::getIsDeleted, 0)
-						.and(i -> i.like(PjGoodsDesc::getCname, cname).or().like(PjGoodsDesc::getCnameInt, cname)));
-					lambdaQueryWrapper.like(PjStockDesc::getBrandName, chineseWords[0]);
+						.eq(PjGoodsDesc::getBrandName, chineseWords[0])
+						.and(i -> i.like(PjGoodsDesc::getCname, cname)
+							.or().like(PjGoodsDesc::getCnameInt, cname)
+							.or().like(PjGoodsDesc::getCname, stockDesc.getCname())
+							.or().like(PjGoodsDesc::getCnameInt, stockDesc.getCname())
+						));
+//					lambdaQueryWrapper.like(PjStockDesc::getBrandName, chineseWords[0]);
 				} else {
 					pjGoodsDescs = goodsDescService.list(new LambdaQueryWrapper<PjGoodsDesc>()
 						.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())