zy-asrs.git - Gitblit

			@@ -8,8 +8,10 @@
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.entity.param.EmptyPlateOutParam;
			import com.zy.asrs.entity.param.StockOutParam;
			import com.zy.asrs.entity.result.FindLocNoAttributeVo;
			import com.zy.asrs.mapper.LocMastMapper;
			import com.zy.asrs.mapper.WrkMastMapper;
			import com.zy.asrs.service.*;
			import com.zy.common.model.LocTypeDto;
			import com.zy.common.model.StartupDto;
			@@ -63,6 +65,9 @@
			@Resource
			private ConfigService configService;

			@Resource
			private WrkMastMapper wrkMastMapper;

			@PostMapping("/pakin/loc/v1")
			@ResponseBody
			@Transactional
			@@ -90,20 +95,38 @@

			StartupDto dto = null;

			// 入库有异常出到出库口1024
			if(!Cools.isEmpty(param.getErrMsg())){
			return exceptionIsOutOfTheWarehouse(param,sourceStaNo,waitPakin);
			}

			if(param.getIoType() == 1) {
			List<SearchLocParam.WantBucket> wantBucketFlag = param.getWantBucketFlag();
			Optional<SearchLocParam.WantBucket> first = wantBucketFlag.stream().filter(wantBucket -> wantBucket.getBucketType() == param.getBucketType()).findFirst();
			if (first.isPresent()) {
			if(waitPakin == null) {
			return R.error("入库通知档为空");
			} else {
			dto = startupFullPutStore(param,waitPakin,first.get()); // 直供罐装线任务
			if (dto != null) {
			log.info("WCS入库直供罐装线接口返参:{},托盘码:{}", dto, param.getBarcode());
			return R.ok().add(dto);
			for(SearchLocParam.WantBucket wantBucket: wantBucketFlag) {
			if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType()) { // 罐装线有要桶信号并且当前桶是罐装线要的桶
			if(waitPakin == null) {
			return R.error("入库通知档为空");
			} else {
			// <4 < 2 < 4
			int count = wrkMastMapper.selectInGzxCount(wantBucket.getSite());
			// int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wantBucket.getSite()));
			if(wantBucket.getSite() == 1071 && count < 4 \|\| wantBucket.getSite() == 1064 && count < 2 \|\| wantBucket.getSite() == 1078 && count < 4) {
			dto = startupFullPutStore(param,waitPakin,wantBucket); // 直供罐装线任务
			if (dto != null) {
			log.info("WCS入库直供罐装线接口返参:{},托盘码:{}", dto, param.getBarcode());
			return R.ok().add(dto);
			}
			} else {
			log.warn("直供灌装线任务已满，入成品库,入库目标站点{}，任务数：{}",wantBucket.getSite(),count);
			}
			}
			}
			}
			}
			// 1.母托盘，2子托盘
			int flag = 0;
			if(param.getIoType() == 10) {
			flag = param.getBucketType() == 21 ? 1 : 2 ;
			}

			switch (param.getIoType()) {
			@@ -112,13 +135,80 @@
			dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakin, param.isTailSupportFlag());
			break;
			case 10://空托盘入库
			dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 1);
			dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 1, flag);
			break;
			default:
			break;
			}
			log.info("WCS入库接口返参:{},托盘码:{}", dto, param.getBarcode());
			return R.ok().add(dto);
			}

			/**
			* 入库异常出到出库口1024
			*/
			@Transactional(propagation = Propagation.REQUIRED)
			public R exceptionIsOutOfTheWarehouse(SearchLocParam param, BasDevp sourceStaNo,WaitPakin waitPakin) {

			StartupDto dto = commonService.getLocNo(param,1024);
			int workNo = dto.getWorkNo();
			Date now = new Date();
			// 生成工作档
			WrkMast wrkMast = new WrkMast();
			wrkMast.setWrkNo(workNo);
			wrkMast.setIoTime(now);
			wrkMast.setWrkSts(2L);
			wrkMast.setIoType(3); // 入出库状态：3.站到站
			wrkMast.setIoPri(13D); // 优先级
			wrkMast.setSourceStaNo(dto.getSourceStaNo());
			wrkMast.setStaNo(dto.getStaNo());
			wrkMast.setBarcode(param.getBarcode()); // 托盘码
			wrkMast.setFullPlt("Y"); // 满板：Y
			wrkMast.setPicking("N"); // 拣料
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk("N"); // 空板
			wrkMast.setLinkMis("Y");
			wrkMast.setCtnType(0); // 尾托标识
			wrkMast.setPdcType(waitPakin != null ? waitPakin.getMaktx() : ""); // 空桶类型
			// 操作人员数据
			wrkMast.setAppeTime(now);
			wrkMast.setModiTime(now);
			wrkMast.setLocNo(param.getErrMsg()); // 异常描述体现在目标库位上
			boolean res = wrkMastService.insert(wrkMast);
			if (!res) {
			throw new CoolException("保存工作档失败");
			}
			// 生成工作档明细
			if(waitPakin != null) {
			WrkDetl wrkDetl = new WrkDetl();
			wrkDetl.sync(waitPakin);
			wrkDetl.setWrkNo(wrkMast.getWrkNo());
			wrkDetl.setIoTime(wrkMast.getIoTime());
			wrkDetl.setAppeTime(now);
			wrkDetl.setModiTime(now);
			if (!wrkDetlService.insert(wrkDetl)) {
			throw new CoolException("保存工作明细失败");
			}
			// 更新入库通知档 ioStatus ===>> Y
			Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
			.eq("zpallet", param.getBarcode());
			WaitPakin setParam = new WaitPakin();
			setParam.setLocNo(dto.getLocNo());
			setParam.setIoStatus("Y");
			setParam.setModiTime(now);
			if (!waitPakinService.update(setParam, wrapper)) {
			throw new CoolException("更新通知档失败");
			}
			}

			// 更新源站点信息
			sourceStaNo.setWrkNo(workNo);
			sourceStaNo.setModiTime(now);
			if (!basDevpService.updateById(sourceStaNo)){
			throw new CoolException("更新源站失败");
			}

			return R.ok(dto);
			}

			// 罐装完成入库
			@@ -146,17 +236,19 @@
			}

			// 获取系统配置，看成品罐装完成是否直接出到发货口
			Config config = configService.selectConfigByCode("gzwcfh");
			String fhFlag = "";
			Config config = configService.selectConfigByCode("gzxfh" + param.getSourceStaNo());
			boolean fhFlag = false;
			int fhk = 0; // 发货口
			if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
			fhFlag = config.getValue();
			fhFlag = true;
			fhk = Integer.parseInt(config.getValue());
			}

			Date now = new Date();
			StartupDto dto;

			// 判断贴标异常，复检重量异常的，不分配库位，去往异常口1090
			// if ( !param.isTbFlag() \|\| param.getGrossWeight() < param.getWeight()) {
			// if ( !param.isTbFlag() \|\| !param.isReinspection()) {
			//
			// // 生成工作档 ------------------------------------------------------
			// WrkMast wrkMast = new WrkMast();
			@@ -190,9 +282,11 @@
			// wrkDetl.setManuDate(param.getManuDate());
			// wrkDetl.setWeight(param.getWeight());
			// wrkDetl.setManLength(param.getGrossWeight());
			// wrkDetl.setInspect(1); // 贴标成功
			// wrkDetl.setVolume(param.getCannedVolume()); // 罐装量
			// wrkDetl.setInspect(param.isTbFlag()?1:0); // 贴标成功
			// wrkDetl.setIoTime(now);
			// wrkDetl.setAppeTime(now);
			// wrkDetl.setModel(wrkDetl1.getMaktx()); // 保存空桶名称
			// wrkDetlService.insert(wrkDetl);
			//
			// dto = new StartupDto();
			@@ -200,7 +294,7 @@
			// dto.setSourceStaNo(wrkMast.getSourceStaNo());
			// dto.setStaNo(wrkMast.getStaNo());
			// } else
			if(param.getMatnr().equals(fhFlag)) { // 直接发货
			if(fhFlag) { // 直接发货
			// 生成工作档 ------------------------------------------------------
			WrkMast wrkMast = new WrkMast();
			wrkMast.setWrkNo(commonService.getWorkNo(0));
			@@ -210,7 +304,7 @@
			wrkMast.setIoPri(13D); // 优先级
			// wrkMast.setCrnNo(dto.getCrnNo());
			wrkMast.setSourceStaNo(param.getSourceStaNo());
			wrkMast.setStaNo(1016);
			wrkMast.setStaNo(fhk);
			// wrkMast.setLocNo(dto.getLocNo());
			wrkMast.setBarcode(wrkMast1.getBarcode()); // 托盘码
			wrkMast.setFullPlt("Y"); // 满板：Y
			@@ -233,9 +327,11 @@
			wrkDetl.setManuDate(param.getManuDate());
			wrkDetl.setWeight(param.getWeight());
			wrkDetl.setManLength(param.getGrossWeight());
			wrkDetl.setVolume(param.getCannedVolume()); // 罐装量
			wrkDetl.setInspect(1);
			wrkDetl.setIoTime(now);
			wrkDetl.setAppeTime(now);
			wrkDetl.setModel(wrkDetl1.getMaktx()); // 保存空桶名称
			wrkDetlService.insert(wrkDetl);

			dto = new StartupDto();
			@@ -285,9 +381,12 @@
			wrkDetl.setManuDate(param.getManuDate());
			wrkDetl.setWeight(param.getWeight());
			wrkDetl.setManLength(param.getGrossWeight());
			wrkDetl.setVolume(param.getCannedVolume());
			wrkDetl.setInspect(1); // 贴标成功
			wrkDetl.setIoTime(now);
			wrkDetl.setAppeTime(now);
			log.warn("成品罐装完成，桶类型保存，新任务号：{},旧任务号:{},旧任务桶型:{}",workNo,wrkMast1.getWrkNo(),wrkDetl1.getMaktx());
			wrkDetl.setModel(wrkDetl1.getMaktx()); // 保存空桶名称
			wrkDetlService.insert(wrkDetl);

			// 更新目标库位状态
			@@ -357,7 +456,7 @@

			if(!param.isTbFlag()) { //下线出库
			wrkMast.setSourceStaNo(1090);
			wrkMast.setStaNo(1016); // 异常下线默认入库站点为1016
			wrkMast.setStaNo(1024); // 异常下线默认入库站点为1016
			wrkMastService.updateById(wrkMast);
			return R.ok();
			}
			@@ -576,6 +675,14 @@
			return wrkMastService.insert(wrkMast) ? R.ok("自动空托入库成功,工作号:"+wrkMast.getWrkNo()) : R.error("生成自动空托入库失败");
			}

			// 自动出空桶
			@PostMapping("/autoOutEmptyBucket")
			@ResponseBody
			public R autoOutEmptyBucket(@RequestBody StockOutParam param){
			workService.startupFullTakeStore(param, 29L);
			return R.ok("出库启动成功");
			}

			@PostMapping("auto/emptyOut/v1")
			@ResponseBody
			public R autoEmptyOut(@RequestBody Map<String,String> emptyPalletSite){
			@@ -694,13 +801,13 @@
			// 源站点状态检测
			BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);

			// 判断空桶库有多少这种桶型
			int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("matnr", param.getBucketType()).where("CAST(SUBSTRING(loc_no, 1, 2) as int) >= 9"));

			// 小于10个则直供罐装线，避免入空桶库后在出库
			if (count > 10) {
			return null;
			}
			// // 判断空桶库有多少这种桶型
			// int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("matnr", param.getBucketType()).where("CAST(SUBSTRING(loc_no, 1, 2) as int) >= 9"));
			//
			// // 小于10个则直供罐装线，避免入空桶库后在出库
			// if (count > 10) {
			// return null;
			// }

			StartupDto dto = commonService.getLocNo(param,wantBucket.getSite());
			int workNo = dto.getWorkNo();
			@@ -762,7 +869,7 @@
			}

			@Transactional
			public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, int locArea) {
			public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, int locArea, int flag) {
			// 源站点状态检测
			BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
			// 检索库位
			@@ -776,7 +883,7 @@
			wrkMast.setIoTime(new Date());
			wrkMast.setWrkSts(2L); // 工作状态：生成入库ID
			wrkMast.setIoType(10); // 入出库状态：10.空板入库
			wrkMast.setIoPri(13D); // 优先级
			wrkMast.setIoPri(14D); // 优先级
			wrkMast.setCrnNo(dto.getCrnNo());
			wrkMast.setSourceStaNo(dto.getSourceStaNo());
			wrkMast.setStaNo(dto.getStaNo());
			@@ -786,6 +893,7 @@
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk("Y"); // 空板
			wrkMast.setLinkMis("Y");
			wrkMast.setPltType(flag); // 空拖类型
			// wrkMast.setBarcode(barcode);
			// wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
			// 操作人员数据