Browse Source

问题修改

xiaochen 2 năm trước cách đây
mục cha
commit
470300200c

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

@@ -580,6 +580,13 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         }
     }
 
+    /**
+    * @Description: 其他出库
+    * @Param: AskGoods askGoods
+    * @return: Map<String, Object> map
+    * @Author: XiaoChen
+    * @Date: 2023/4/15
+    */
     @Override
     public Map<String, Object> otherAskGoods(AskGoods askGoods) {
         Map<String, Object> map = new HashMap<>();

+ 8 - 3
src/main/java/com/tld/service/impl/DeliveryServiceImpl.java

@@ -72,9 +72,14 @@ public class DeliveryServiceImpl implements DeliveryService {
                     int occupy = deliveryMapper.getVitrual(inventory);
                     if(occupy == 0){
                         if(Double.doubleToLongBits(Double.parseDouble(inventory.getAmount())) == Double.doubleToLongBits(Double.parseDouble(delivery.getOutNum()))){
-                            list.add(inventory);
-                            map.put("data", list);
-                            map.put("msg", "200");
+                            for(Inventory inventorys : deliveryMapper.getInventory(storageLocationCode, delivery)){
+                                if (inventorys.getStorageLocationCode().equals(inventory.getStorageLocationCode())){
+                                    list.add(inventorys);
+                                    map.put("data", list);
+                                    map.put("msg", "200");
+
+                                }
+                            }
                             return map;
                         }
                     }

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

@@ -958,7 +958,7 @@
             and attribute = #{attribute}
         </if>
         <if test="producDate != '' and producDate != null">
-            and produc_batch = #{producDate}
+            and produc_date = #{producDate}
         </if>
         <if test="supplierId != '' and supplierId != null">
             and supplier_id = #{supplierId}

+ 2 - 2
src/main/resources/mapper/DeliveryMapper.xml

@@ -112,8 +112,8 @@
     </update>
     <!-- 产成品出库流水 -->
     <insert id="addRemovalHalf">
-        insert into tld_removal_half(wllb_code,num,user_id,scrq,delivery_id,company_number,customer_code,storage_code,wbs,account_sleeve,transmission_type)
-        value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{companyNumber},#{customerCode},#{storageCode},#{wbs},#{companyNumber},0)
+        insert into tld_removal_half(wllb_code,num,user_id,scrq,delivery_id,company_number,customer_code,storage_code,wbs,transmission_type)
+        value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{companyNumber},#{customerCode},#{storageCode},#{wbs},0)
     </insert>
     <!-- 查询销售单父级信息 -->
     <select id="getDeliveryF" resultType="com.tld.model.Delivery">