修改pom文件

pom.xml

@@ -260,6 +260,19 @@
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <!-- 可选：也可以一并排除spring-boot-starter-logging，但排除logback-classic已经足够 -->
+                <!--
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+                -->
+            </exclusions>
         </dependency>
 
 
@@ -442,6 +455,12 @@
             <groupId>com.bstek.ureport</groupId>
             <artifactId>ureport2-console</artifactId>
             <version>2.2.9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -463,16 +482,34 @@
             <groupId>org.activiti</groupId>
             <artifactId>activiti-engine</artifactId>
             <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-spring</artifactId>
             <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-json-converter</artifactId>
             <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -492,12 +529,22 @@
                     <artifactId>activiti-simple-workflow</artifactId>
                     <groupId>org.activiti</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-modeler</artifactId>
             <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
@@ -505,21 +552,45 @@
             <groupId>org.activiti</groupId>
             <artifactId>activiti-rest</artifactId>
             <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-diagram-rest</artifactId>
             <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-cxf</artifactId>
             <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-image-generator</artifactId>
             <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java

@@ -115,6 +115,7 @@ public class OutServiceImpl implements OutService {
             store.setOutFlag("0");   //孙雪松 取消出库恢复原有状态
             store.setOutId("");
             store.setLockFlag("0");
+            store.setCancelFlag("0");
             currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(store.getStack().getId(), belongId));
             store.setLayer(currentLayer + 1);
             //store.setStack(stack);
@@ -351,6 +352,8 @@ public class OutServiceImpl implements OutService {
                     outRecord.setInvoicePrice(invoicePrice);
                 }
                 outRecord.setPayWay(price.getPayWay());
+            }else {
+                outRecord.setPayWay("");
             }
 
 

src/main/resource/localhost/db.properties

@@ -3,12 +3,12 @@
 #jdbc.user=root
 #jdbc.password=root
 
-#jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
-#jdbc.user=root
-#jdbc.password=root
-
 jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
+jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?useUnicode=true&characterEncoding=utf8
 jdbc.user=root
-jdbc.password=122403
+jdbc.password=root
+
+#jdbc.driverClass=com.mysql.jdbc.Driver
+#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
+#jdbc.user=root
+#jdbc.password=122403

src/main/resource/mapper/ware/StoreMapper.xml

@@ -479,6 +479,7 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     select a.ware_id from t_maint_userware a  where a.user_id = #{param3,jdbcType=VARCHAR}
      )  and t.belong_id = #{param4,jdbcType=VARCHAR}
     and  t.out_id = #{param1,jdbcType=VARCHAR}
+    and t.cancel_flag = '0'
   </update>
 
 

src/main/webapp/WEB-INF/config.properties

@@ -1,3 +1,3 @@
 #ureport.fileStoreDir=C:\\thwareUpload\\ureportfiles
-ureport.fileStoreDir=/home/sam/thwareUpload/ureportfiles
+ureport.fileStoreDir=/home/sam/thwareUpload/ureportfiles/zg
 licenseKey=YKwznudRJheF/VXncJLppg==