问题修改

xpyy/src/main/java/com/xpyy/xpyy/mapper/DeliveryNoteMapper.java

@@ -3,9 +3,12 @@ package com.xpyy.xpyy.mapper;
 import com.xpyy.xpyy.entity.DeliveryNote;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface DeliveryNoteMapper {
     Map<String, Object> getDeliveryList(DeliveryNote deliveryNote);
+
+    List<Map<String, Object>> getDeliveryListZ(DeliveryNote deliveryNote);
 }

xpyy/src/main/java/com/xpyy/xpyy/service/impl/DeliveryNoteServiceImpl.java

@@ -34,6 +34,8 @@ public class DeliveryNoteServiceImpl implements DeliveryNoteService {
         try{
             //查询指定送货单
             Map<String,Object> list = deliveryNoteMapper.getDeliveryList(deliveryNote);
+            //查询送货单子表信息 批次
+            List<Map<String,Object>> list1 = deliveryNoteMapper.getDeliveryListZ(deliveryNote);
             map.put("data", list);
             map.put("msg", "200");
         } catch (Exception e){

xpyy/src/main/resources/mapper/DeliveryNoteMapper.xml

@@ -7,9 +7,40 @@
         select
             a.poid,
             a.cVenCode,
-            a.SendCode,
-
+            a.SendCode as sendCode,
+            a.ComCode as comCode,
+            b.cVenName,
+            c.companyName
         from send_main a
-        where SendCode = #{}
+        left join vendor b on a.cVenCode = b.cVenCode
+        left join xp_company c on a.ComCode = c.code
+        where a.SendCode = #{SendCode}
+    </select>
+    <!--查询送货单子表信息-->
+    <select id="getDeliveryListZ" resultType="java.util.Map">
+        select
+            a.id,
+            a.SendCode as sendCode,
+            a.PosId as posId,
+            a.cInvCode,
+            a.iQuantity1,
+            a.iQuantity2,
+            a.iUnitPrice,
+            a.dArriveDate,
+            a.iflag,
+            a.states,
+            a.cbMemo,
+            a.cDefine17,
+            a.cDefine18,
+            a.cDefine19,
+            a.cDefine20,
+            a.cbatchno,
+            b.Pcode,
+            b.cInvName,
+            c.ChkCycle as chkCycle
+        from send_detailinfo a
+        left join inventory b on a.cInvCode = b.ErpCode
+        left join xp_checkstand c on a.cInvCode = c.ChkstdCode
+        where a.SendCode = #{SendCode}
     </select>
 </mapper>