仓库资料增加反过账

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/WarehouseApi.java

@@ -10,6 +10,9 @@ import java.util.Map;
 public interface WarehouseApi {
 
     @GetMapping("/api/document/warehouse/post")
-    public Result callProcedure(Map<String, Object> param);
+    public Result post(Map<String, Object> param);
+
+    @GetMapping("/api/document/warehouse/unPost")
+    public Result unPost(Map<String, Object> param);
 
 }

applications/document/document-server/pom.xml

@@ -65,6 +65,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-dto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/WarehouseController.java

@@ -25,10 +25,21 @@ public class WarehouseController {
      */
     @GetMapping("/post")
     public Result post(Map<String, Object> map){
-        warehouseService.callProcedure(map);
+        warehouseService.post(map);
         return Result.success(map.get("result"));
     }
 
+    /**
+     * 反过账
+     * @param map
+     * @return
+     */
+    @GetMapping("/unPost")
+    public Result unPost(Map<String, Object> map){
+        warehouseService.unPost(map);
+        return Result.success();
+    }
+
     /**
      * 保存
      * @param data

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/WarehouseMapper.java

@@ -7,7 +7,7 @@ import java.util.Map;
 
 public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
-    void callProcedure(Map<String, Object> map);
+    void post(Map<String, Object> map);
 
     Short validPeriod(Map<String, Object> map);
 
@@ -22,4 +22,6 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
     int updateByPrimaryKeySelective(Warehouse record);
 
     int updateByPrimaryKey(Warehouse record);
+
+    void unPost(Map<String, Object> map);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/WarehouseService.java

@@ -9,9 +9,11 @@ import java.util.Map;
 
 public interface WarehouseService extends CommonBaseService<WarehouseMapper, Warehouse> {
 
-    void callProcedure(Map<String, Object> map);
+    void post(Map<String, Object> map);
 
     boolean validPeriod(String periods);
 
     int insertSelective(Warehouse record);
+
+    void unPost(Map<String, Object> map);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorkindServiceImpl.java

@@ -15,7 +15,11 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
 
     @Override
     public boolean save(Vendorkind vendorkind){
-        vendorkindMapper.insertSelective(vendorkind);
+        if(vendorkind.getId() == 0){
+            vendorkindMapper.insertSelective(vendorkind);
+        }else{
+            vendorkindMapper.updateByPrimaryKeySelective(vendorkind);
+        }
         return true;
     }
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/WarehouseServiceImpl.java

@@ -13,11 +13,20 @@ import java.util.Map;
 @Service
 public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
 
+    /**
+     * 过账
+     * @param map
+     */
     @Override
-    public void callProcedure(Map<String, Object> map){
-        getMapper().callProcedure(map);
+    public void post(Map<String, Object> map) {
+        getMapper().post(map);
     }
 
+    /**
+     * 账期校验
+     * @param period
+     * @return
+     */
     @Override
     public boolean validPeriod(String period) {
         long companyId = BaseContextHolder.getCompanyId();
@@ -32,10 +41,23 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         }
     }
 
+    /**
+     * 保存
+     * @param record
+     * @return
+     */
     @Override
     public int insertSelective(Warehouse record) {
         int count = getMapper().insertSelective(record);
         return count;
     }
 
+    /**
+     * 反过账
+     * @param map
+     */
+    @Override
+    public void unPost(Map<String, Object> map) {
+        getMapper().unPost(map);
+    }
 }

applications/document/document-server/src/main/resources/application.yml

@@ -47,7 +47,8 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+#      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.31:8500/eureka/
 server:
   port: 9480
   tomcat:

applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml

@@ -20,17 +20,19 @@
         <result column="wh_text4" property="wh_text4" jdbcType="VARCHAR" />
         <result column="wh_text5" property="wh_text5" jdbcType="VARCHAR" />
     </resultMap>
-    <select id="callProcedure" parameterMap="paramMap" statementType="CALLABLE">
+    <select id="post" parameterMap="postParamMap" statementType="CALLABLE">
         CALL SP_COMMITPRODINOUT(?, ?, ?, ?, ?)
     </select>
-    <parameterMap id="paramMap" type="java.util.Map">
+    <select id="unPost" parameterMap="postParamMap" statementType="CALLABLE">
+        CALL SP_UNCOMMITPRODINOUT(?, ?, ?, ?, ?)
+    </select>
+    <parameterMap id="postParamMap" type="java.util.Map">
         <parameter property="inoutNo" jdbcType="VARCHAR" mode="IN" />
         <parameter property="class" jdbcType="VARCHAR" mode="IN" />
         <parameter property="commitid" jdbcType="INTEGER" mode="IN" />
         <parameter property="companyid" jdbcType="INTEGER" mode="IN" />
         <parameter property="result" jdbcType="VARCHAR" mode="OUT" />
     </parameterMap>
-
     <select id="validPeriod" parameterType="map" resultType="java.lang.Short">
         SELECT IFNULL(PD_STATUS,0) PD_STATUS FROM PERIODSDETAIL WHERE COMPANYID=#{companyId} AND PD_DETNO=#{period}
     </select>

applications/pom.xml

@@ -14,9 +14,9 @@
     <description>applications</description>
     <modules>
         <module>purchase</module>
-        <!--<module>sale</module>
+        <module>sale</module>
         <module>storage</module>
-        <module>money</module>-->
+        <module>money</module>
         <module>document</module>
         <module>commons</module>
     </modules>