update06

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/controller/StackingAndLoadingVehiclesController.java

@@ -71,23 +71,33 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 
 	@ApiOperation(value="根据垛位查询堆垛列表", notes="根据垛位查询堆垛列表")
 	@GetMapping(value = "/getListBySatck")
-	public Result<?> getListBySatck(String stack){
-		List<List<StackingAndLoadingVehicles>> res =  stackingAndLoadingVehiclesService.getListBySatck(stack);
+	public Result<?> getListBySatck(@RequestParam(name="typeConfigId") String typeConfigId){
+		List<List<StackingAndLoadingVehicles>> res =  stackingAndLoadingVehiclesService.getListBySatck(typeConfigId);
 		return Result.OK(res);
 	}
-	
+
+	 @ApiOperation(value="基础类型堆垛ID查询堆垛信息", notes="基础类型堆垛ID查询堆垛信息")
+	 @GetMapping(value = "/getListByTypeConfigId")
+	 public Result<?> getListByTypeConfigId(@RequestParam(name="typeConfigId") String typeConfigId){
+		 List<StackingAndLoadingVehicles> res = stackingAndLoadingVehiclesService.getListByTypeConfigId(typeConfigId);
+		 if (oConvertUtils.listIsEmpty(res)){
+			 return Result.OK("获取堆垛信息为空！");
+		 }
+		 return Result.OK(res);
+	 }
+
 	/**
 	 *   添加
 	 *
 	 * @param stackingAndLoadingVehicles
 	 * @return
 	 */
-	@AutoLog(value = "垛位装车-添加")
-	@ApiOperation(value="垛位装车-添加", notes="垛位装车-添加")
+	@AutoLog(value = "钢坯上垛-添加")
+	@ApiOperation(value="钢坯上垛-添加", notes="钢坯上垛-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody StackingAndLoadingVehicles stackingAndLoadingVehicles) {
-		stackingAndLoadingVehiclesService.save(stackingAndLoadingVehicles);
-		return Result.OK("添加成功！");
+	public Result<String> add(@RequestBody LoadingParams loadingParams) {
+		stackingAndLoadingVehiclesService.saveUpperStacking(loadingParams);
+		return Result.OK("钢坯上垛成功！");
 	}
 
 	 /**
@@ -131,6 +141,7 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 		 stackingAndLoadingVehiclesService.addBatch(savVo);
 		 return Result.OK("添加成功！");
 	 }
+
 	
 	/**
 	 *  编辑
@@ -268,11 +279,11 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
     		return Result.OK("请至少装入3夹钢坯！");
 		}
 		 Set<String> heats = new HashSet<>();
-		 for (StackingAndLoadingVehicles sav : loadingParams.getStackingAndLoadingVehiclesList()) {
-			 heats.add(sav.getHeatNo());
+		 for (StackingAndLoadingVehicles stackingAndLoadingVehicles : loadingParams.getStackingAndLoadingVehiclesList()) {
+			 heats.add(stackingAndLoadingVehicles.getHeatNo());
 		 }
 		 if(heats.size()>3)return Result.error("一次只能选择三种炉次的钢坯");
-    	stackingAndLoadingVehiclesService.loading(loadingParams);
+    	stackingAndLoadingVehiclesService.loadingHandle(loadingParams);
 		return Result.OK("发车成功");
      }
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/entity/StackingAndLoadingVehicles.java

@@ -105,4 +105,9 @@ public class StackingAndLoadingVehicles implements Serializable {
     @Dict(dicCode = "billet_spec")
     private String spec;
 
+    /**规格*/
+    @Excel(name = "基础类型堆垛ID", width = 15)
+    @ApiModelProperty(value = "基础类型堆垛ID")
+    private String typeConfigId;
+
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/IStackingAndLoadingVehiclesService.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface IStackingAndLoadingVehiclesService extends IService<StackingAndLoadingVehicles> {
 
-    List<List<StackingAndLoadingVehicles>> getListBySatck(String stack);
+    List<List<StackingAndLoadingVehicles>> getListBySatck(String typeConfigId);
 
     void addBatch(SavVo savVo);
 
@@ -33,4 +33,10 @@ public interface IStackingAndLoadingVehiclesService extends IService<StackingAnd
     void startHeight(SavVo savVo);
 
     List<StackingAndLoadingVehicles> getListByCarNum(String carNum);
+
+    void saveUpperStacking(LoadingParams loadingParams);
+
+    List<StackingAndLoadingVehicles> getListByTypeConfigId(String typeConfigId);
+
+    void loadingHandle(LoadingParams loadingParams);
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -8,14 +8,18 @@ import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
 import org.jeecg.modules.billet.billetHotsend.mapper.RulerDefaultConfigMapper;
 import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
 import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
+import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
+import org.jeecg.modules.billet.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
 import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneService;
 import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeService;
 import org.jeecg.modules.billet.rollClubTwo.service.IRollClubTwoService;
 import org.jeecg.modules.billet.rollHeight.service.IRollHeightService;
 import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingAndLoadingVehicles;
+import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingUpLog;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.mapper.StackingAndLoadingVehiclesMapper;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingAndLoadingVehiclesService;
+import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingUpLogService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.SavVo;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
@@ -59,11 +63,15 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
     private IRollHeightService rollHeightService;
     @Autowired
     private IRollOutShippService rollOutShippService;
+    @Autowired
+    private IBilletHotsendTypeConfigService billetHotsendTypeConfigService;
+    @Autowired
+    private IStackingUpLogService stackingUpLogService;
 
     @Override
-    public List<List<StackingAndLoadingVehicles>> getListBySatck(String stack) {
+    public List<List<StackingAndLoadingVehicles>> getListBySatck(String typeConfigId) {
         LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.eq(StackingAndLoadingVehicles::getStackAddr, stack).isNull(StackingAndLoadingVehicles::getCarNum);
+        wrapper.eq(StackingAndLoadingVehicles::getTypeConfigId, typeConfigId);
         List<StackingAndLoadingVehicles> list = baseMapper.selectList(wrapper);
         Boolean isNotNull = oConvertUtils.listIsNotEmpty(list);
         List<List<StackingAndLoadingVehicles>> res = new ArrayList<>();
@@ -84,7 +92,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                     sav.set(new StackingAndLoadingVehicles());
                     sav.get().setLayer(layer);
                     sav.get().setAddress(adddress);
-                    sav.get().setStackAddr(stack);
+                    sav.get().setStackAddr(typeConfigId);
                 }
                 savs.add(sav.get());
             }
@@ -404,6 +412,59 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         return stackingAndLoadingVehicles;
     }
 
+    @Override
+    public void saveUpperStacking(LoadingParams loadingParams) {
+        // 根据billetHotsendTypeConfigId 查询基础垛位信息
+        BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(loadingParams.getBilletHotsendTypeConfigId());
+        // 保存 钢坯上垛后信息至 公共容器
+        List<StackingAndLoadingVehicles> stackingAndLoadingVehiclesList = loadingParams.getStackingAndLoadingVehiclesList();
+        stackingAndLoadingVehiclesList.forEach(x ->{
+            StackingAndLoadingVehicles stackingAndLoadingVehicles = new StackingAndLoadingVehicles();
+            BeanUtils.copyProperties(x, stackingAndLoadingVehicles);
+            stackingAndLoadingVehicles.setStackAddr(billetHotsendTypeConfig.getTypeName());
+            stackingAndLoadingVehicles.setTypeConfigId(billetHotsendTypeConfig.getId());
+            baseMapper.insert(stackingAndLoadingVehicles);
+        });
+        // 保存上垛信息日志
+        List<StackingUpLog> stackingUpLogList = new ArrayList<>();
+        stackingAndLoadingVehiclesList.forEach(y ->{
+            StackingUpLog stackingUpLog = new StackingUpLog();
+            BeanUtils.copyProperties(y, stackingUpLog);
+            stackingUpLog.setBilletNo(y.getBilletNos());
+            stackingUpLog.setCreateDate(new Date());
+        });
+        stackingUpLogService.saveBatch(stackingUpLogList);
+    }
+
+    @Override
+    public List<StackingAndLoadingVehicles> getListByTypeConfigId(String typeConfigId) {
+        LambdaQueryWrapper<StackingAndLoadingVehicles> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StackingAndLoadingVehicles::getTypeConfigId, typeConfigId);
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public void loadingHandle(LoadingParams loadingParams) {
+        // 1 根据billetHotsendTypeConfigId 查询基础垛位信息
+
+        // 2 先移除 堆垛公共容器中的记录 stacking_and_loading_vehicles
+
+        // 3 保存 下垛日志    stacking_down_log
+
+        // 4 保存或更新 钢坯热送基础信息 billet_hotsend
+
+        // 5 根据所属表 保存对应的棒线和对象信息，明细信息 roll_club_two、roll_club_two_details、roll_club_three、roll_club_three_details、roll_out_shipp、roll_out_shipp_details
+
+        // 6 更新装运单 storage_bill 《保存：不操作装运单》
+
+        // 7 发车后，新增钢坯堆垛储运信息 storage_car_log
+
+        // 8 更新钢坯基础信息 billet_basic_info
+
+
+
+    }
+
     public void addStorageBill(List<StackingAndLoadingVehicles> savs,String castMachine,String carNum,String destination){
         StorageBillModel storageBillModel = storageBillModelService.getOne(new LambdaQueryWrapper<StorageBillModel>().eq(StorageBillModel::getCastMachine,castMachine));
         Integer carTimes = 0;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/vo/LoadingParams.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.billet.stackingAndLoadingVehicles.vo;
 
 import lombok.Data;
+import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsend;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingAndLoadingVehicles;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 
@@ -8,13 +9,29 @@ import java.util.List;
 
 @Data
 public class LoadingParams {
-
+    /**
+     * 已选择的钢坯基础，
+     */
     private List<StackingAndLoadingVehicles> stackingAndLoadingVehiclesList;
 
+    /**
+     * 钢坯热送基础信息
+     */
+    private BilletHotsend billetHotsend;
+
+    /**
+     * 装运单信息
+     */
     private StorageBill storageBill;
 
+    /**
+     *  钢坯类型配置ID
+     */
     private String billetHotsendTypeConfigId;
 
+    /**
+     *  所属表
+     */
     private String belongTable;
 
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -227,7 +227,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		 queryWrapper.eq(StorageBill::getCcmNo, ccmNo).isNotNull(StorageBill::getArrivalTime).isNull(StorageBill::getOutTime);
 		 List<StorageBill> storageBillList = storageBillService.list(queryWrapper);
 		 if (oConvertUtils.listIsEmpty(storageBillList)) {
-			 return Result.error("未找到对应数据");
+			 return Result.OK("未找到对应数据");
 		 }
 		 return Result.OK(storageBillList);
 	 }