From a57d4fd4c1e673a26cf57c2384b6e07827b060ca Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 29 May 2024 18:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=AE=B6=E7=AB=AF?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/ModuleNameConstant.java    |  5 +++++
 blade-service-api/logpm-business-api/pom.xml   | 18 ++++++++++++++++++
 blade-service-api/pom.xml                      |  3 +++
 .../logpm/business/BusinessApplication.java    | 17 +++++++++++++++++
 .../mapper/DistributionStockupMapper.xml       |  2 +-
 blade-service/pom.xml                          |  2 ++
 6 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 blade-service-api/logpm-business-api/pom.xml
 create mode 100644 blade-service/logpm-business/src/main/java/com/logpm/business/BusinessApplication.java

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
index d46618e07..f4c0de04d 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
@@ -135,4 +135,9 @@ public interface ModuleNameConstant {
 	 */
 	String LOGPM_FACTORY_DATA_OPPEIN_NAME = "logpm-factory-data-oppein" + DEVAUTH;
 
+	/**
+	 * 商家模块
+	 */
+	String LOGPM_BUSINESS_NAME = "logpm-business" + DEVAUTH;
+
 }
diff --git a/blade-service-api/logpm-business-api/pom.xml b/blade-service-api/logpm-business-api/pom.xml
new file mode 100644
index 000000000..24c096b69
--- /dev/null
+++ b/blade-service-api/logpm-business-api/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.2.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-business-api</artifactId>
+    <version>3.2.0.RELEASE</version>
+
+
+</project>
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index b7b10a21b..89f2c56e3 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -45,6 +45,9 @@
         <!-- 商家转化模块 -->
         <module>logpm-business-conversion-api</module>
         <module>logpm-factory-data-zbom-api</module>
+
+        <!--商家端  -->
+        <module>logpm-business-api</module>
     </modules>
 
     <dependencies>
diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/BusinessApplication.java b/blade-service/logpm-business/src/main/java/com/logpm/business/BusinessApplication.java
new file mode 100644
index 000000000..048ae5f84
--- /dev/null
+++ b/blade-service/logpm-business/src/main/java/com/logpm/business/BusinessApplication.java
@@ -0,0 +1,17 @@
+package com.logpm.business;
+
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.cloud.client.BladeCloudApplication;
+import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
+
+@BladeCloudApplication
+@SeataCloudApplication
+public class BusinessApplication {
+
+	public static void main(String[] args) {
+		BladeApplication.run(ModuleNameConstant.LOGPM_BUSINESS_NAME, BusinessApplication.class, args);
+	}
+
+}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 99d95a924..4036796a8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -640,7 +640,7 @@
                               and ldrs.stock_list_status in (1, 3)
                         ) inventoryNub
         from logpm_distribution_reservation ldr
-                 LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id
+                 LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id AND AND ldsi.stock_status != 4
                  LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
                  LEFT JOIN logpm_distribution_reservation_stockarticle ldrs
                  on ldrs.reservation_id = ldr.id and ldrs.stock_article_status in (1, 3)
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index c7b5c2aac..69f65ccb5 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -47,6 +47,8 @@
 <!--        工厂数据-->
         <module>logpm-factory-data</module>
         <module>logpm-data-sharing</module>
+        <!-- 商家端 -->
+        <module>logpm-business</module>
 
 
     </modules>