Browse Source

1.修改取消出库,再次打印出库单,出库单没有更新的问题

2.开设版本管理文件夹,管理历史发布war包
dw 4 months ago
parent
commit
b63a55a177

+ 4
- 0
src/main/java/com/th/demo/mapping/ware/DistributionMapper.java View File

1
 package com.th.demo.mapping.ware;
1
 package com.th.demo.mapping.ware;
2
 
2
 
3
 import com.th.demo.model.ware.Distribution;
3
 import com.th.demo.model.ware.Distribution;
4
+import org.apache.ibatis.annotations.Param;
4
 
5
 
5
 import java.util.List;
6
 import java.util.List;
6
 
7
 
20
     List<Distribution> selectWaitTrucks(String userId, String belongId);
21
     List<Distribution> selectWaitTrucks(String userId, String belongId);
21
 
22
 
22
     Distribution selectByTruckNo(String truckNo, String belongId);
23
     Distribution selectByTruckNo(String truckNo, String belongId);
24
+
25
+    //    取消出库修改cancle_flag字段
26
+    int updateCancleFlag(@Param("distributionId") String distributionId, @Param("outId") String outId);
23
 }
27
 }

+ 2
- 0
src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java View File

106
         if (stack.getIsLayer().equals("0")) {
106
         if (stack.getIsLayer().equals("0")) {
107
             for (int i = 0; i < listOutRecord.size(); i++) {
107
             for (int i = 0; i < listOutRecord.size(); i++) {
108
                 listOutRecord.get(i).setBackFlag("1");
108
                 listOutRecord.get(i).setBackFlag("1");
109
+                int i1 = distributionMapper.updateCancleFlag(listOutRecord.get(i).getDistributionId(),listOutRecord.get(i).getId());
109
                 num += outRecordMapper.updateByPrimaryKey(listOutRecord.get(i));
110
                 num += outRecordMapper.updateByPrimaryKey(listOutRecord.get(i));
110
                 store = storeMapper.selectByOutId(listOutRecord.get(i).getId(), noUserParam,userId, belongId);
111
                 store = storeMapper.selectByOutId(listOutRecord.get(i).getId(), noUserParam,userId, belongId);
111
                 storeMapper.updateByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
112
                 storeMapper.updateByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
128
         } else {
129
         } else {
129
             for (int i = 0; i < listOutRecord.size(); i++) {
130
             for (int i = 0; i < listOutRecord.size(); i++) {
130
                 listOutRecord.get(i).setBackFlag("1");
131
                 listOutRecord.get(i).setBackFlag("1");
132
+                int i1 = distributionMapper.updateCancleFlag(listOutRecord.get(i).getDistributionId(),listOutRecord.get(i).getId());
131
                 num += outRecordMapper.updateByPrimaryKey(listOutRecord.get(i));
133
                 num += outRecordMapper.updateByPrimaryKey(listOutRecord.get(i));
132
                 store = storeMapper.selectByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
134
                 store = storeMapper.selectByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
133
                 storeMapper.updateByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
135
                 storeMapper.updateByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);

+ 13
- 0
src/main/resource/mapper/ware/DistributionMapper.xml View File

215
     </set>
215
     </set>
216
     where id = #{id,jdbcType=INTEGER}
216
     where id = #{id,jdbcType=INTEGER}
217
   </update>
217
   </update>
218
+    <update id="updateCancleFlag"  parameterType="java.lang.String" >
219
+        UPDATE t_ware_distribution_detail
220
+        SET cancel_flag = '1'
221
+        WHERE
222
+            distribution_id = #{distributionId}
223
+          AND store_id = (
224
+            SELECT
225
+                id
226
+            FROM
227
+                t_ware_store
228
+            WHERE
229
+                out_id = #{outId})
230
+    </update>
218
   <update id="updateByPrimaryKey" parameterType="com.th.demo.model.ware.Distribution" >
231
   <update id="updateByPrimaryKey" parameterType="com.th.demo.model.ware.Distribution" >
219
     update t_ware_distribution
232
     update t_ware_distribution
220
     set truck_no = #{truckNo,jdbcType=VARCHAR},
233
     set truck_no = #{truckNo,jdbcType=VARCHAR},

BIN
版本管理/thware_mj.war View File


Loading…
Cancel
Save