Browse Source

出库退库bug修复

hfxc226 2 years ago
parent
commit
45f3c3cfef

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/store/OutStoreDetail.java

@@ -113,7 +113,7 @@ public class OutStoreDetail implements Serializable {
     /**
      * 是否出库:0退库,1出库
      */
-    private Boolean isOut;
+    private Integer outFlag;
 
     /**
      * 打印新增字段

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreDetailVO.java

@@ -135,7 +135,7 @@ public class OutStoreDetailVO extends BaseVO implements Serializable {
     /**
      * 是否出库:0退库,1出库
      */
-    private Boolean isOut;
+    private Integer outFlag;
 
     private String remark;  // 备注
 

+ 4 - 4
platform-dao/src/main/resources/mapper/store/OutStoreDetailMapper.xml

@@ -12,7 +12,7 @@
                                      outstoredetail.real_num,
                                      outstoredetail.store_num,
                                      outstoredetail.yy_id,outstoredetail.auto_id,
-                                     outstoredetail.is_out,
+                                     outstoredetail.out_flag,
 outstoredetail.c_batch,
                                      outstoredetail.store_name,
                                      outstoredetail.spare_name,
@@ -39,7 +39,7 @@ outstoredetail.c_batch,
                                      outstoredetail.real_num,
                                      outstoredetail.store_num,
                                      outstoredetail.yy_id,outstoredetail.auto_id,
-                                     outstoredetail.is_out,
+                                     outstoredetail.out_flag,
                                      outstoredetail.store_name,
                                      outstoredetail.spare_name,
                                      outstoredetail.num,
@@ -59,8 +59,8 @@ outstoredetail.c_batch,
         <if test="autoId != null and autoId != ''">
             and outstoredetail.auto_id = #{autoId}
         </if>
-        <if test="isOut != null and isOut != ''">
-            and outstoredetail.is_out = #{isOut}
+        <if test="outFlag != null and outFlag != ''">
+            and outstoredetail.out_flag = #{outFlag}
         </if>
         <if test="type != null and type != ''">
             and outstoredetail.type = #{type}

+ 2 - 1
platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -24,6 +24,7 @@ import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
 import com.platform.dao.entity.store.*;
 import com.platform.dao.enums.OutStoreStatusEnum;
 import com.platform.dao.enums.SparePickFormStatusEnum;
+import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.sqarepartmanage.SparePartInfoMapper;
 import com.platform.dao.mapper.store.SparePickDetailMapper;
 import com.platform.dao.mapper.store.SparePickFormMapper;
@@ -286,7 +287,7 @@ public class YongyouServiceImpl implements YongyouService {
             OtherOutDetail detail = new OtherOutDetail();
             detail.setId(vo.getSpareId());
             detail.setCinvcode(vo.getNo());
-            if (vo.getIsOut()) {
+            if (vo.getOutFlag() == YesNoEnum.YES.getValue()) {
                 detail.setIquantity(vo.getNum());
             } else {// 负数为退库
                 detail.setIquantity(vo.getNum().negate());