问题修改

src/main/java/com/tld/model/Delivery.java

@@ -135,4 +135,8 @@ public class Delivery implements Serializable {
      * 库存数量
      */
     private String amount;
+    /**
+     * wbs编号
+     */
+    private String wbsCode;
 }

src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -87,15 +87,15 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 }
             }
             for(AskGoods askGoods : askGoodsList) {
-                int count = askGoodsMapper.getAskGoods(askGoods);
-                if (count != 0) {
-                    askGoodsMapper.updateAskGoodsNum(askGoods);
-                } else {
+//                int count = askGoodsMapper.getAskGoods(askGoods);
+//                if (count != 0) {
+//                    askGoodsMapper.updateAskGoodsNum(askGoods);
+//                } else {
                     if (askGoodsMapper.getAskGoodsf(askGoods) == 0) {
                         askGoodsMapper.addAskGoodsf(askGoods);
                     }
                     askGoodsMapper.addAskGoods(askGoods);
-                }
+//                }
                 askGoodsMapper.addAskGoodsLog(askGoods);
             }
             //新增日志

src/main/resources/mapper/DeliveryMapper.xml

@@ -10,7 +10,8 @@
             b.delivery_code,
             a.entry_number,
             a.material_id,
-            d.code as wbs,
+            d.code as wbsCode,
+            a.wbs,
             a.measurement_id,
             a.gs_delivery_num,
             a.gs_cancel_num,
@@ -133,6 +134,7 @@
         <if test="storageLocationCode != null and storageLocationCode != ''">
             and a.storage_location_code = #{storageLocationCode}
         </if>
+        and (a.amount + 0) <![CDATA[>=]]> (#{num} + 0) limit 1
     </select>
     <!--    暂时使用 后期删除-->