fix: 在托列表增加打托方式

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java

@@ -44,4 +44,9 @@ public class BasicdataTrayVO extends BasicdataTrayEntity {
 	@ApiModelProperty(value = "禁用状态（值）")
 	private String disableTypeName;
 
+	@ApiModelProperty(value = "打托方式")
+	private String trayType;
+	@ApiModelProperty(value = "打托方式显示")
+	private String trayTypeString;
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -60,9 +60,11 @@
         tray.disable_type,
         tray.tray_status,
         warehouse.name AS warehouseName,
-        tray.`type`
-        FROM
+        tray.`type`,
+        lwtt.tray_type
+        lwtt  FROM
         logpm_warehouse_tray AS tray
+        left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id
         INNER JOIN logpm_warehouse_warehouse AS warehouse ON tray.warehouse_id = warehouse.id
         <where>
             tray.is_deleted = '0'

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java

@@ -44,6 +44,7 @@ import com.logpm.warehouse.vo.WarehouseTraybarCode;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.constant.CodeNumConstant;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.common.utils.TemplateUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -52,6 +53,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -148,13 +150,12 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
 	@Override
 	public IPage<BasicdataTrayVO> selectTrayList(IPage<Object> page, Map<String, Object> basicdataTray) {
-		//获取当前登录人仓库
-//		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse();
-//		List<Long> collect = myWatchWarehouse.stream()
-//			.map(BasicdataWarehouseEntity::getId)
-//			.collect(Collectors.toList());
-//		basicdataTray.put("warehouseList",collect);
 		IPage<BasicdataTrayVO> trayList= trayMapper.selectTrayList(page,basicdataTray);
+		for (int i = 0; i < trayList.getRecords().size(); i++) {
+			if(ObjectUtils.isNotNull(trayList.getRecords().get(i).getTrayType())){
+				trayList.getRecords().get(i).setTrayTypeString(DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayList.getRecords().get(i).getTrayType()));
+			}
+		}
 		return trayList;
 	}