zy-asrs.git - Gitblit

			@@ -11,6 +11,7 @@
			import com.zy.common.model.LocDto;
			import com.zy.common.model.TaskDto;
			import com.zy.common.web.BaseController;
			import lombok.Synchronized;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestBody;
			@@ -81,8 +82,8 @@
			if (issued <= 0.0D) {
			continue;
			}
			List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
			orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
			List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
			orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
			for (LocDetl locDetl : locDetls) {
			if (issued > 0) {
			LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
			@@ -128,8 +129,8 @@
			continue;
			}

			List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
			orderDetl.getBrand(),orderPakOut.getDocType()==11?null:orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
			List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
			orderDetl.getBrand(), orderPakOut.getDocType() == 11 ? null : orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
			for (LocDetl locDetl : locDetls) {
			if (issued > 0) {
			LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
			@@ -172,15 +173,16 @@
			return R.ok().add(locDtos);
			}

			@Synchronized
			@PostMapping("/out/pakout/auth")
			@ManagerAuth(memo = "订单出库")
			public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
			public R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
			if (Cools.isEmpty(locDtos)) {
			return R.parse(BaseRes.PARAM);
			}
			List<LocDto> locDtoArrayList = new ArrayList<>();
			for (LocDto locDto : locDtos){
			if (locDto.getFrozen()!=1 && locDto.getFrozenLoc()!=1){
			for (LocDto locDto : locDtos) {
			if (locDto.getFrozen() != 1 && locDto.getFrozenLoc() != 1) {
			locDtoArrayList.add(locDto);
			}
			}
			@@ -204,7 +206,9 @@
			List<TaskDto> taskDtos = new ArrayList<>();
			// 根据（库位 & 出库站）分组；理想状态：一组为一次出库任务
			for (LocDto locDto : locDtos) {
			if (locDto.isLack()) { continue; }
			if (locDto.isLack()) {
			continue;
			}
			TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
			if (TaskDto.has(taskDtos, taskDto)) {
			TaskDto dto = TaskDto.find(taskDtos, taskDto);
			@@ -223,28 +227,35 @@
			//优先级
			int ioPri = 50;
			//已下空板出库任务数量
			int j=1;
			int j = 1;
			// -----------------------------------------------------------------------------------------------
			for (TaskDto taskDto : taskDtos) {
			BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
			workService.stockOut(staNo, taskDto, getUserId(),ioPri);
			workService.stockOut(staNo, taskDto, getUserId(), ioPri);
			ioPri--;
			i++;
			//配盘出库单使用，下发需要出的空板任务
			if (orderPakout.getDocType() == 11) {
			if (size<5&&i==size){
			for (;j<=orderPakout.getPayType();j++){
			String bar="";
			if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){
			bar = "A01";
			if (i == size) {
			for (; j <= orderPakout.getPayType(); j++) {
			LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", taskDto.getLocNo()));
			Integer locType = Integer.valueOf(locMast1.getLocType2());
			//配盘出库单出库区域时Q-L4时,出大托盘空板
			if(orderPakout.getCstmrName().equals("Q-L4")){
			locType = 2;
			}
			LocMast locMast = new LocMast();
			if(Cools.isEmpty(bar)){
			locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D"));
			}else {
			locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D").like("barcode", bar));
			String bar = "";
			//具体待定
			// if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){
			// bar = "A01";
			// }
			LocMast locMast = new LocMast();
			if (Cools.isEmpty(bar)) {
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D").eq("loc_type2", locType));
			} else {
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D").eq("loc_type2", locType).like("barcode", bar));
			}

			if (Cools.isEmpty(locMast)) {
			@@ -253,23 +264,41 @@
			String locNo = locMast.getLocNo();
			EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
			emptyPlateOutParam.setOutSite(303);
			emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locNo);}});
			WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,ioPri);
			emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
			add(locNo);
			}});
			String agvSta = "";
			if (locMast.getLocType3() == 2) {
			agvSta = "Z-LZP26";
			}else if (locType == 2){

			}
			else {
			agvSta = orderPakout.getCstmrName();//agv目标站点位置
			}
			WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam, ioPri, agvSta);
			ioPri--;

			}
			}else if(i == 5){
			String bar="";
			if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){
			} else if (i == 4) {
			LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", taskDto.getLocNo()));
			Integer locType = Integer.valueOf(locMast1.getLocType2());
			//配盘出库单出库区域时Q-L4时,出大托盘空板
			if(orderPakout.getCstmrName().equals("Q-L4")){
			locType = 2;
			}

			String bar = "";
			if (!Cools.isEmpty(orderPakout.getShipCode()) && orderPakout.getShipCode().equals("A01")) {
			bar = "A01";
			}
			LocMast locMast = null;
			if(Cools.isEmpty(bar)){
			locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D"));
			}else {
			locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D").like("barcode", bar));
			if (Cools.isEmpty(bar)) {
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D").eq("loc_type2", locType));
			} else {
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_sts", "D").eq("loc_type2", locType).like("barcode", bar));
			}

			if (Cools.isEmpty(locMast)) {
			@@ -278,13 +307,91 @@
			String locNo = locMast.getLocNo();
			EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
			emptyPlateOutParam.setOutSite(303);
			emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locNo);}});
			WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,ioPri);
			emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
			add(locNo);
			}});
			String agvSta = "";
			if (locMast.getLocType3() == 2) {

			} else {
			agvSta = orderPakout.getCstmrName();//agv目标站点位置
			}
			WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam, ioPri, agvSta);
			ioPri--;
			j++;
			}
			}
			}
			return R.ok();
			}

			@PostMapping("/out/pakout/preview/auth1")
			@ManagerAuth
			public R pakoutPreview1(@RequestBody String orderNo) throws InterruptedException {
			if (Cools.isEmpty(orderNo)) {
			return R.parse(BaseRes.PARAM);
			}
			List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));

			if (orderDetlPakouts.size() == 0) {
			return R.parse("订单明细为空");
			}

			List<LocDto> locDtos = new ArrayList<>();

			Set<String> exist = new HashSet<>();

			// 获取订单主表
			OrderPakout orderPakOut = orderPakOutService.selectByNo(orderDetlPakouts.get(0).getOrderNo());

			for (OrderDetlPakout orderDetl : orderDetlPakouts) {
			double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
			if (issued <= 0.0D) {
			continue;
			}

			List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
			orderDetl.getBrand(), orderPakOut.getDocType() == 11 ? null : orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
			for (LocDetl locDetl : locDetls) {
			if (issued > 0) {
			LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
			issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
			locDto.setFrozen(locDetl.getFrozen());
			locDto.setFrozenLoc(locMast.getFrozen());
			List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
			locDto.setStaNos(staNos);
			locDto.setBrand(orderDetl.getBrand());

			locDto.setStandby1(orderDetl.getStandby1());
			locDto.setStandby2(orderDetl.getStandby2());
			locDto.setStandby3(orderDetl.getStandby3());
			locDto.setBoxType1(orderDetl.getBoxType1());
			locDto.setBoxType2(orderDetl.getBoxType2());
			locDto.setBoxType3(orderDetl.getBoxType3());
			locDtos.add(locDto);
			exist.add(locDetl.getLocNo());
			// 剩余待出数量递减
			issued = issued - locDetl.getAnfme();
			} else {
			break;
			}
			}
			if (issued > 0) {
			LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
			locDto.setBrand(orderDetl.getBrand());
			locDto.setStandby1(orderDetl.getStandby1());
			locDto.setStandby2(orderDetl.getStandby2());
			locDto.setStandby3(orderDetl.getStandby3());
			locDto.setBoxType1(orderDetl.getBoxType1());
			locDto.setBoxType2(orderDetl.getBoxType2());
			locDto.setBoxType3(orderDetl.getBoxType3());
			locDto.setLack(Boolean.TRUE);
			locDtos.add(locDto);
			}
			}
			R pakout = pakout(locDtos);
			return R.ok().add(pakout);
			}

			}