zhs 2 éve
szülő
commit
2c5319d985

+ 2 - 0
src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -169,4 +169,6 @@ public interface AskGoodsMapper {
     List<Map<String, Object>> getCreateOtherDeliveryMaterialsWarehouseWhere(@Param("removalCode") String removalCode);
 
     List<Map<String, Object>> getCreateOtherDeliveryMaterialsParent(@Param("documentId") String documentId);
+
+    void updateEnquiryOutNum(AskGoods askGoods);
 }

+ 1 - 0
src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -674,6 +674,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     .setDocumentId(askGoods.getAskGoodsId())
                     .setEntryNumber(askGoods.getEntryNumber())
                     .setDocumentPointsId(askGoods.getId());
+            askGoodsMapper.updateEnquiryOutNum(askGoods); //增加数量
             askGoodsMapper.addReturnGsRemovalF(returRemoval);//新增返回gs数据父表信息
             askGoodsMapper.addReturnGsRemoval(returRemoval);//新增返回gs数据子表信息
             map.put("data", removalCode);

+ 7 - 5
src/main/java/com/tld/service/impl/WarehousingServiceImpl.java

@@ -586,11 +586,13 @@ public class WarehousingServiceImpl implements WarehousingService {
                 return map;
             }
             Notice notice1 = warehousingMapper.getNoticeId(new Notice().setNoticeId(notice.getNoticeId()).setMaterialId(notice.getMaterialId()));
-            Double contrast = Double.parseDouble(notice1.getWarehousingNum()) + Double.parseDouble(notice.getWarehousingNum());
-            if(Double.doubleToLongBits(contrast) > Double.doubleToLongBits(Double.parseDouble(notice1.getNum()))){
-                map.put("msg", "500");
-                map.put("errMsg", "扫描数量超出报工单数量");
-                return map;
+            if(notice1 != null) {
+                Double contrast = Double.parseDouble(notice1.getWarehousingNum()) + Double.parseDouble(notice.getWarehousingNum());
+                if(Double.doubleToLongBits(contrast) > Double.doubleToLongBits(Double.parseDouble(notice1.getNum()))) {
+                    map.put("msg", "500");
+                    map.put("errMsg", "扫描数量超出报工单数量");
+                    return map;
+                }
             }
             notice.setWllbClass(material.getWllbClass());
             StringBuffer stringBuffer = new StringBuffer();//库位编号

+ 4 - 0
src/main/resources/mapper/AskGoodsMapper.xml

@@ -1344,4 +1344,8 @@
     <update id="updateRemovalHalf">
         update tld_removal_half set transmission_type = "1" where storage_code = #{removalCode}
     </update>
+    <!-- 往单据上增加数量 -->
+    <update id="updateNoticesWarehousingNum">
+        update tld_enquiry set out_num = (out_num + 0) + #{amount} where ask_goods_id = #{askGoodsId} and entry_number = #{entryNumber}
+    </update>
 </mapper>

+ 1 - 1
src/main/resources/mapper/WarehousingMapper.xml

@@ -1073,6 +1073,6 @@
     </select>
     <!-- 往单据上增加数量 -->
     <update id="updateNoticesWarehousingNum">
-        update tld_notices set warehousing_num = #{amount} where notice_id = #{noticeId} and entry_number = #{entryNumber}
+        update tld_notices set warehousing_num = warehousing_num + #{amount} where notice_id = #{noticeId} and entry_number = #{entryNumber}
     </update>
 </mapper>