zhangyuewww 4 tahun lalu
induk
melakukan
3f2cc80a0b

+ 1 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranTaskInfoServiceImpl.java

@@ -72,6 +72,7 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 tranProcessInfoWrapper.orderBy("sort",false);
                 tranTaskInfo.setCurrentTransferAddress(tranProcessInfo.getReceivePrivate() + tranProcessInfo.getReceiveCity()
                     + tranProcessInfo.getReceiveArea() + tranProcessInfo.getReceiveDetailedAddress() );
+                this.updateById(tranTaskInfo);
             }
         }
 

+ 1 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranTaskInfoMapper.xml

@@ -56,8 +56,6 @@
         t.end_area as endArea,
         t.end_detailed_address as endDetailedAddress,
         t.receive_warehouse as receiveWarehouse,
-        p.process_status_flag as processStatusFlag,
-        p.process_status as processStatus,
         t.status
         FROM tran_task_info t
         LEFT JOIN tran_process_info p ON t.id=p.info_id
@@ -88,6 +86,7 @@
             AND (lower(t.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(t.task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
+        group by p.info_id
         ORDER BY t.status DESC , t.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}

+ 1 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -98,6 +98,7 @@
         w.in_out_date as inOutDate,
         w.in_out_type as inOutType,
         w.contract_no as contractNo,
+        w.temporary_out_type as temporaryOutType,
         w.car_no as carNo,
         w.agent,
         w.back_office as backOffice,