增加商家端模块

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;
+
 }

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>

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>

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);
+	}
+
+}

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)

blade-service/pom.xml

@@ -47,6 +47,8 @@
 <!--        工厂数据-->
         <module>logpm-factory-data</module>
         <module>logpm-data-sharing</module>
+        <!-- 商家端 -->
+        <module>logpm-business</module>
 
 
     </modules>