no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/parts/WebsitPartsSalesOrderLogic.java

@@ -411,6 +411,7 @@ public class WebsitPartsSalesOrderLogic {
             //检查是否有可用库存
             final List<WebsitStock> partsWebsitStockList = websitStockService.lambdaQuery()
                     .in(WebsitStock::getGoodsId, partsNumbers)
+                    .eq(WebsitStock::getGoodsType, WebsitGoodsTypeEnum.P.toString())
                     .eq(WebsitStock::getCompanyWechatId, partsSalesOrderBean.getCompanyWechatId())
                     .eq(WebsitStock::getWebsitId, partsSalesOrderBean.getWebsitId())
                     .list();
@@ -466,7 +467,7 @@ public class WebsitPartsSalesOrderLogic {
                     item.setMaterialGroupName(parts.getMaterialGroupName());
                     item.setGoodsStockUnit(parts.getGoodsStockUnit());
                     item.setPartsWebsitId(partsSalesOrderBean.getPartsWebsitId());
-                    item.setPartsNumber(parts.getGoodsId());
+                    item.setPartsNumber(parts.getGoodsCode());
                     item.setMarketPrice(parts.getMarketPrice());
                     item.setExamineQty(item.getQty());
                     item.setSecondPrice(parts.getSecondPrice());
@@ -518,6 +519,7 @@ public class WebsitPartsSalesOrderLogic {
                 if (Objects.nonNull(stock) && salesItem.getQty().compareTo(stock.getQty()) > 0) {
                     throw new RemoteServiceException(salesItem.getPartsName() + " 销售数量不能大于库存数量");
                 }
+                salesItem.setStockQty(stock.getQty());
             }
         }
         for(PartsSalesOrderItemBean partsSalesOrderItemBean : itemList) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WebsitGoodsLogic.java

@@ -69,6 +69,7 @@ public class WebsitGoodsLogic {
             List<WebsitStock> stocks = websitStockService.lambdaQuery()
                     .in(WebsitStock::getGoodsId, page.getRecords().stream().map(WebsitGoodsMVO::getGoodsId).collect(Collectors.toList()))
                     .eq(WebsitStock::getCompanyWechatId, adminUser.getCompanyWechatId())
+                    .eq(WebsitStock::getGoodsType, WebsitGoodsTypeEnum.M.getKey())
                     .eq(WebsitStock::getWebsitId, zfireParamBean.getWebsitId())
                     .eq(WebsitStock::getStorageId, zfireParamBean.getStorageId())
                     .list();
@@ -90,6 +91,7 @@ public class WebsitGoodsLogic {
             List<WebsitStock> stocks = websitStockService.lambdaQuery()
                     .in(WebsitStock::getGoodsId, page.getRecords().stream().map(WebsitGoodsPVO::getGoodsId).collect(Collectors.toList()))
                     .eq(WebsitStock::getCompanyWechatId, adminUser.getCompanyWechatId())
+                    .eq(WebsitStock::getGoodsType, WebsitGoodsTypeEnum.P.getKey())
                     .eq(WebsitStock::getWebsitId, zfireParamBean.getWebsitId())
                     .eq(WebsitStock::getStorageId, zfireParamBean.getStorageId())
                     .list();

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -215,6 +215,7 @@ public class WebsitPartsSalesOrderLogic {
             //检查是否有可用库存
             final List<WebsitStock> partsWebsitStockList = websitStockService.lambdaQuery()
                     .in(WebsitStock::getGoodsId, partsNumbers)
+                    .eq(WebsitStock::getGoodsType, WebsitGoodsTypeEnum.P.getKey())
                     .eq(WebsitStock::getCompanyWechatId, partsSalesOrderBean.getCompanyWechatId())
                     .eq(WebsitStock::getWebsitId, partsSalesOrderBean.getWebsitId())
                     .list();

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPurchaseLogic.java

@@ -83,6 +83,7 @@ public class WebsitPurchaseLogic {
             List<WebsitStock> stocks = websitStockService.lambdaQuery()
                     .in(WebsitStock::getGoodsId, list.stream().map(WebsitPurchaseItemBean::getGoodsId).collect(Collectors.toList()))
                     .eq(WebsitStock::getCompanyWechatId, bean.getCompanyWechatId())
+                    .eq(WebsitStock::getGoodsType, purchase.getGoodsType())
                     .eq(WebsitStock::getStorageId, purchase.getStorageId())
                     .eq(WebsitStock::getWebsitId, bean.getWebsitId())
                     .list();

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPurchaseRetLogic.java

@@ -80,6 +80,7 @@ public class WebsitPurchaseRetLogic {
             List<WebsitStock> stocks = websitStockService.lambdaQuery()
                     .in(WebsitStock::getGoodsId, list.stream().map(WebsitPurchaseRetItemBean::getGoodsId).collect(Collectors.toList()))
                     .eq(WebsitStock::getCompanyWechatId, bean.getCompanyWechatId())
+                    .eq(WebsitStock::getGoodsType, purchase.getGoodsType())
                     .eq(WebsitStock::getStorageId, bean.getStorageId())
                     .eq(WebsitStock::getWebsitId, bean.getWebsitId())
                     .list();
@@ -152,6 +153,7 @@ public class WebsitPurchaseRetLogic {
         final List<WebsitStock> stocks = websitStockService.lambdaQuery()
                 .eq(WebsitStock::getCompanyWechatId, bean.getCompanyWechatId())
                 .eq(WebsitStock::getWebsitId, bean.getWebsitId())
+                .eq(WebsitStock::getGoodsType, bean.getGoodsType())
                 .eq(WebsitStock::getStorageId, bean.getStorageId())
                 .in(WebsitStock::getGoodsId, bean.getItems().stream()
                         .map(WebsitPurchaseRetItemBean::getGoodsId)

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitSalesLogic.java

@@ -111,6 +111,7 @@ public class WebsitSalesLogic {
             List<WebsitStock> stocks = websitStockService.lambdaQuery()
                     .in(WebsitStock::getGoodsId, list.stream().map(WebsitSalesItemBean::getGoodsId).collect(Collectors.toList()))
                     .eq(WebsitStock::getCompanyWechatId, bean.getCompanyWechatId())
+                    .eq(WebsitStock::getGoodsType, sales.getGoodsType())
                     .eq(WebsitStock::getStorageId, bean.getStorageId())
                     .eq(WebsitStock::getWebsitId, bean.getWebsitId())
                     .list();

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WebsitStockLogic.java

@@ -129,6 +129,7 @@ public class WebsitStockLogic {
             }
             Integer count = websitStockService.lambdaQuery()
                     .eq(WebsitStock::getCompanyWechatId, adminUser.getCompanyWechatId())
+                    .eq(WebsitStock::getGoodsType, websitGoodsTypeEnum.getKey())
                     .eq(WebsitStock::getWebsitId,adminWebsit.getWebsitId())
                     .eq(WebsitStock::getGoodsId, goodsId).count();
             if(count > 0){