1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -46,6 +46,10 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 合同号/补充协议编号
      */
     private String contractNo;
+    /**
+     * 提示
+     */
+    private String pointOut;
     /**
      * 合同类型(1销售2采购3收购)
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -219,7 +219,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         }
         //查看车次信息
         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                .eq(TranCarInfo.QueryFiles.PROCESS_ID, id).eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0).orderBy("tran_car_no").orderBy("box_no"));
+                .eq(TranCarInfo.QueryFiles.PROCESS_ID, id).eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0).orderBy("loading_date",false).orderBy("tran_car_no"));
         //车牌号不为空时,查询目标车牌号list
         if (!StringUtils.isEmpty(carNo)) {
             List<TranCarInfo> carInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -2451,6 +2451,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         pageView.put("binNumber", warehouseInOutInfo.getBinNumber());
         pageView.put("statusFlag", warehouseInOutInfo.getStatusFlag());
         pageView.put("searchType", warehouseInOutInfo.getSearchType());
+        pageView.put("inOutType", warehouseInOutInfo.getInOutType());
         pageView.put("pageSize", warehouseInOutInfo.getPageSize());
         pageView.put("currentPage", warehouseInOutInfo.getCurrentPage());
         pageView.put("phone", warehouseInOutInfo.getPhone());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -70,6 +70,7 @@
         m.workflow_id as workflowId,
         m.comp_id as compId,
         m.contract_no as contractNo,
+        m.point_out as pointOut,
         g.goods_name as goodsName,
         g.grade as grade,
         m.weight,

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

@@ -48,6 +48,9 @@
         <if test="baseId != null and baseId != ''">
             AND w.base_id = #{baseId}
         </if>
+        <if test="inOutType != null and inOutType != ''">
+            AND w.in_out_type = #{inOutType}
+        </if>
         <if test="binNumber != null and binNumber != ''">
             AND (lower(w.bin_number) like lower(CONCAT('%',#{binNumber},'%')))
         </if>
@@ -81,6 +84,7 @@
         w.grade,
         w.in_out_date as inOutDate,
         w.in_out_flag as inOutFlag,
+        w.in_out_task_no as inOutTaskNo,
         w.warehouse_name as warehouseName,
         w.in_out_type as inOutType,
         w.contract_no as contractNo,
@@ -176,6 +180,9 @@
         <if test="baseId != null and baseId != ''">
             AND w.base_id = #{baseId}
         </if>
+        <if test="inOutType != null and inOutType != ''">
+            AND w.in_out_type = #{inOutType}
+        </if>
         <if test="binNumber != null and binNumber != ''">
             AND (lower(w.bin_number) like lower(CONCAT('%',#{binNumber},'%')))
         </if>