zy-asrs.git - Gitblit

			@@ -1,19 +1,25 @@
			package com.zy.asrs.controller;

			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.core.common.Cools;
			import com.core.common.R;
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.AgvBasDevp;
			import com.zy.asrs.entity.AgvLocDetl;
			import com.zy.asrs.entity.param.AgvMobileStartPakin;
			import com.zy.asrs.entity.param.AgvMobileStartParam;
			import com.zy.asrs.entity.param.CombParam;
			import com.zy.asrs.service.AgvBasDevpService;
			import com.zy.asrs.service.AgvMobileService;
			import com.zy.asrs.service.AgvWorkService;
			import com.zy.asrs.service.*;
			import com.zy.common.web.BaseController;
			import lombok.Synchronized;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RestController;

			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;
			@@ -32,22 +38,39 @@
			private AgvBasDevpService agvBasDevpService;
			@Autowired
			private AgvWorkService workService;
			@Autowired
			private AgvLocMastService agvLocMastService;
			@Autowired
			private OrderDetlService orderDetlService;
			@Autowired
			private AgvLocDetlService agvLocDetlService;


			/*
			locno？组托+绑定暂存位：组托
			*/
			@PostMapping("/comb/auth")
			public R comb(@RequestBody CombParam combParam){
			String message = agvMobileService.comb(combParam, 1l);
			return R.ok(message);
			agvMobileService.comb(combParam, getUserId());

			return R.ok();
			}

			/*
			绑定托盘条码与暂存位
			*/
			@PostMapping("/combBinging/auth")
			public R combBinding(@RequestBody Map<String,Object> map){
			String barcode = map.get("barcode").toString();
			String stationCode = map.get("stationCode").toString();
			agvMobileService.combBinding(barcode,stationCode);
			Short containerType = Short.valueOf(barcode.substring(0,2));
			agvMobileService.combBinding(barcode,stationCode,containerType);
			return R.ok("托盘绑定站点成功");
			}

			/*
			获取当前已绑定的还没生成工作档的暂存位
			*/
			@PostMapping("/getBasDevp/auth")
			public R getBasDevpByFloor(@RequestBody Map<String,Object> map){
			String floor = map.get("floor").toString();
			@@ -57,22 +80,110 @@
			return R.error("参数错误");
			}

			/*
			获取输送线站点
			*/
			@PostMapping("/getBasDevp/noCacheShelves/auth")
			public R getBasDevpByNoCacheShelves(){
			return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
			}

			/*
			启动入库，生成工作档
			*/
			@PostMapping("/pakin/auth")
			@Synchronized
			public R pakin(@RequestBody Map<String,Object> map){
			List<String> devNos = (List<String>) map.get("devNo");

			List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
			if (!"F".equals(agvBasDevp.getLocSts())) {
			throw new CoolException("当前站点货位状态不为F.在库，请重新选择");
			}
			return agvBasDevp;
			return agvBasDevpService.selectById(devNo);
			}).collect(Collectors.toList());

			workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
			workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);

			return R.ok("生成工作档成功");
			}

			/*
			启动入库，组托 + 生产工作档
			*/
			@PostMapping("/start/pakin/auth")
			@Synchronized
			@Transactional
			public R startPakin(@RequestBody AgvMobileStartPakin params){
			// 组托
			params.getCombParams().forEach(combParam -> {
			agvMobileService.comb(combParam,getUserId());
			});
			params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
			workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);

			return R.ok("生成工作档成功");
			}

			/*
			入库
			*/
			@PostMapping("/pakin/empty/auth")
			@Synchronized
			public R pakinEmpty(@RequestBody AgvMobileStartParam params){

			for (AgvMobileStartParam.Pda pda : params.getPad()) {
			pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
			workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
			}

			return R.ok();
			}

			/*
			空板出库
			*/
			@PostMapping("/pakout/empty/auth")
			@Synchronized
			public R pakoutEmpty(@RequestBody AgvMobileStartParam params){

			for (AgvMobileStartParam.Pda pda : params.getPad()) {
			workService.emptyPlateOut(pda.getDevNo(),pda.getContainerType(), getUserId());
			}

			return R.ok();
			}

			/*
			空板出库容器码选择
			*/
			@PostMapping("/pakout/empty/container/selector/auth")
			public R containerType(@RequestBody HashMap<String,String> params){

			String devNo = params.get("devNo");
			AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);

			return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));

			}

			/*
			查询库存入库订单与销售单号
			*/
			@PostMapping("/query/locDetl/v1")
			public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){

			String orderNo = params.get("orderNo");
			String threeCode = params.get("threeCode");
			String matnr = params.get("matnr");

			Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);

			// wrapper.eq("orderNo",orderNo);

			wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);

			List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);

			return R.ok(agvLocDetls);
			}


			}