1.工厂订单信息

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/StaorderPackagesController.java

@@ -17,6 +17,7 @@
 package com.logpm.factory.snm.controller;
 
 import com.logpm.factory.jobhandler.FactoryXxlJob;
+import com.logpm.factory.snm.entity.StationOrderEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -24,6 +25,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.common.constant.PackagesTypeEnum;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -35,6 +37,9 @@ import com.logpm.factory.snm.entity.StaorderPackagesEntity;
 import com.logpm.factory.snm.vo.StaorderPackagesVO;
 import com.logpm.factory.snm.service.IStaorderPackagesService;
 import org.springblade.core.boot.ctrl.BladeController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
 
 /**
  * 寺尼曼运单 控制器
@@ -69,9 +74,14 @@ public class StaorderPackagesController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入staorderPackages")
 	public R<IPage<StaorderPackagesEntity>> list(StaorderPackagesEntity staorderPackages, Query query) {
 		IPage<StaorderPackagesEntity> pages = staorderPackagesService.page(Condition.getPage(query), Condition.getQueryWrapper(staorderPackages));
+		//转换包件类型
+		List<StaorderPackagesEntity> records = pages.getRecords();
+		records.forEach(e->{e.setLx(PackagesTypeEnum.getMes(e.getLx()));});
 		return R.data(pages);
 	}
 
+
+
 	/**
 	 * 寺尼曼运单 自定义分页
 	 */

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/StationOrderController.java

@@ -34,6 +34,9 @@ import com.logpm.factory.snm.entity.StationOrderEntity;
 import com.logpm.factory.snm.vo.StationOrderVO;
 import com.logpm.factory.snm.service.IStationOrderService;
 import org.springblade.core.boot.ctrl.BladeController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Map;
 
 /**
  * 寺尼曼运单 控制器
@@ -59,14 +62,25 @@ public class StationOrderController extends BladeController {
 		StationOrderEntity detail = stationOrderService.getOne(Condition.getQueryWrapper(stationOrder));
 		return R.data(detail);
 	}
+//	/**
+//	 * 寺尼曼运单 分页
+//	 */
+//	@GetMapping("/list")
+//	@ApiOperationSupport(order = 2)
+//	@ApiOperation(value = "分页", notes = "传入stationOrder")
+//	public R<IPage<StationOrderEntity>> list(StationOrderEntity stationOrder, Query query) {
+//		IPage<StationOrderEntity> pages = stationOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(stationOrder));
+//		return R.data(pages);
+//	}
+
 	/**
 	 * 寺尼曼运单 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入stationOrder")
-	public R<IPage<StationOrderEntity>> list(StationOrderEntity stationOrder, Query query) {
-		IPage<StationOrderEntity> pages = stationOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(stationOrder));
+	public R<IPage<StationOrderEntity>> list(@ApiIgnore @RequestParam Map<String, Object> stationOrder, Query query) {
+		IPage<StationOrderEntity> pages = stationOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(stationOrder, StationOrderEntity.class));
 		return R.data(pages);
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/StationlinenumController.java

@@ -112,6 +112,17 @@ public class StationlinenumController extends BladeController {
 		return R.status(stationlinenumService.updateById(stationlinenum));
 	}
 
+	/**
+	 * 诗尼曼线路 字典
+	 */
+	@GetMapping("/dictionary")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "诗尼曼线路")
+	public R<List<StationlinenumVO>> dictionary() {
+		List<StationlinenumVO> dictionary = stationlinenumService.selectFactoryStationLinenumDictionary();
+		return R.data(dictionary);
+	}
+
 	/**
 	 * 诗尼曼线路 新增或修改
 	 */

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.java

@@ -52,4 +52,6 @@ public interface StationlinenumMapper extends BaseMapper<StationlinenumEntity> {
 	List<StationlinenumExcel> exportStationlinenum(@Param("ew") Wrapper<StationlinenumEntity> queryWrapper);
 
     StationlinenumEntity selectNameByNumber(String number);
+
+    List<StationlinenumVO> selectFactoryStationLinenumDictionary();
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.xml

@@ -28,7 +28,8 @@
     <select id="selectNameByNumber" resultMap="stationlinenumResultMap" parameterType="String">
         SELECT * FROM snm_stationlinenum where logistics_line_number like concat('%',#{number},'%')
     </select>
-
-
+    <select id="selectFactoryStationLinenumDictionary" resultType="com.logpm.factory.snm.vo.StationlinenumVO">
+        select logistics_line_number logisticsLineNumber,logistics_line_name logisticsLineName from snm_stationlinenum where is_deleted = 0
+    </select>
 
 </mapper>

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/IStationlinenumService.java

@@ -52,4 +52,11 @@ public interface IStationlinenumService extends BaseService<StationlinenumEntity
 	List<StationlinenumExcel> exportStationlinenum(Wrapper<StationlinenumEntity> queryWrapper);
 
 	StationlinenumEntity selectNameByNumber(String number);
+	/**
+	 * 作为字典查询
+	 *
+	 * @return
+	 */
+    List<StationlinenumVO> selectFactoryStationLinenumDictionary();
+
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/StationlinenumServiceImpl.java

@@ -56,4 +56,9 @@ public class StationlinenumServiceImpl extends BaseServiceImpl<StationlinenumMap
 		return baseMapper.selectNameByNumber(number);
 	}
 
+	@Override
+	public List<StationlinenumVO> selectFactoryStationLinenumDictionary() {
+		return baseMapper.selectFactoryStationLinenumDictionary();
+	}
+
 }