修改物流状态

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/controller/IostReceivingNoteController.java

@@ -542,12 +542,14 @@ public class IostReceivingNoteController {
          double totleWeightTotal = 0;//重量总
          int totlePackagesTotal = 0;//箱数总
          double totlePrice = 0;//价格总
+         double totleMoney = 0;//
          for(IostReceivingNoteList iostReceivingNoteList: iostIostReceivingNoteList)
          {
              totlevolume = totlevolume + iostReceivingNoteList.getVolume();
              totlePackagesTotal = totlePackagesTotal + iostReceivingNoteList.getPackages();
              totleWeightTotal = totleWeightTotal + iostReceivingNoteList.getWeight();
              totlePrice = totlePrice + iostReceivingNoteList.getPrice();
+             totleMoney = totleMoney + iostReceivingNoteList.getMoney();
          }
          IostReceivingNoteList curIostReceivingNotlist = new IostReceivingNoteList();
          curIostReceivingNotlist.setNameChs("总和");
@@ -555,6 +557,7 @@ public class IostReceivingNoteController {
          curIostReceivingNotlist.setWeight(totleWeightTotal);
          curIostReceivingNotlist.setPackages(totlePackagesTotal);
          curIostReceivingNotlist.setPrice(totlePrice);
+         curIostReceivingNotlist.setMoney(totleMoney);
          iostIostReceivingNoteList.add(curIostReceivingNotlist);
      }
 	

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/IostDeliveryRecordPageMapper.xml

@@ -3,18 +3,19 @@
 <mapper namespace="org.jeecg.modules.iost.basedata.mapper.IostDeliveryRecordPageMapper">
 
     <select id="selectlist" resultType="org.jeecg.modules.iost.basedata.vo.IostDeliveryRecordPage">
-        SELECT *
-        FROM  iost_deliverstatus AS D,iost_deliverstatus_list AS L
+        SELECT D.*,L.date,L.location FROM iost_deliverstatus AS D LEFT JOIN (
+        SELECT * FROM iost_deliverstatus_list WHERE id IN(
+        SELECT MAX(id) id  FROM iost_deliverstatus_list GROUP BY deliverstatus_id
+        )) AS L
+        ON D.id = L.deliverstatus_id
         <where>
             <if test="iostDeliveryRecordPage.bulkNo !=null">
-            and bulk_no = iostDeliveryRecordPage.bulkNo
+            and bulk_no = #{iostDeliveryRecordPage.bulkNo}
             </if>
             <if test="iostDeliveryRecordPage.containerNo !=null">
-                and container_no = iostDeliveryRecordPage.bulkNo
+                and container_no = #{iostDeliveryRecordPage.containerNo}
             </if>
-            and D.id = L.deliverstatus_id
         </where>
-        limit #{pageNo},#{pageSize}
     </select>
 
 </mapper>
\ No newline at end of file

jeecg-boot-module-system/target/classes/org/jeecg/modules/iost/basedata/mapper/xml/IostDeliveryRecordPageMapper.xml

@@ -3,18 +3,19 @@
 <mapper namespace="org.jeecg.modules.iost.basedata.mapper.IostDeliveryRecordPageMapper">
 
     <select id="selectlist" resultType="org.jeecg.modules.iost.basedata.vo.IostDeliveryRecordPage">
-        SELECT *
-        FROM  iost_deliverstatus AS D,iost_deliverstatus_list AS L
+        SELECT D.*,L.date,L.location FROM iost_deliverstatus AS D LEFT JOIN (
+        SELECT * FROM iost_deliverstatus_list WHERE id IN(
+        SELECT MAX(id) id  FROM iost_deliverstatus_list GROUP BY deliverstatus_id
+        )) AS L
+        ON D.id = L.deliverstatus_id
         <where>
             <if test="iostDeliveryRecordPage.bulkNo !=null">
-            and bulk_no = iostDeliveryRecordPage.bulkNo
+            and bulk_no = #{iostDeliveryRecordPage.bulkNo}
             </if>
             <if test="iostDeliveryRecordPage.containerNo !=null">
-                and container_no = iostDeliveryRecordPage.bulkNo
+                and container_no = #{iostDeliveryRecordPage.containerNo}
             </if>
-            and D.id = L.deliverstatus_id
         </where>
-        limit #{pageNo},#{pageSize}
     </select>
 
 </mapper>
\ No newline at end of file