zy-asrs.git - Gitblit

			@@ -2,7 +2,6 @@

			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.core.common.Cools;
			import com.core.common.DateUtils;
			import com.core.common.R;
			@@ -1591,8 +1590,8 @@
			@Transactional
			public R zphjCdwc(ZphjcdwcParam param) {

			if (Cools.isEmpty(param.getWorkNo())) {
			throw new CoolException("工作号不能为空！");
			if (Cools.isEmpty(param.getWorkNo(),param.getBarcode(),param.getSourceStaNo(),param.getSite())) {
			return R.parse("参数不能为空，请检查入参");
			}
			WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
			if (wrkMast == null) {
			@@ -1602,60 +1601,59 @@
			throw new CoolException("工作档当前状态不为42/出库类型不为拣料！");
			}

			// 保存工作主档历史档
			if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
			throw new CoolException("保存工作主档历史档失败");
			}
			// 获取目标站
			Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
			.eq("type_no", wrkMast.getIoType() - 50)
			.eq("stn_no", wrkMast.getStaNo()) // 作业站点 = 拣料出库的目标站
			.eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
			StaDesc staDesc = staDescService.selectOne(wrapper);
			if (Cools.isEmpty(staDesc)) {
			throw new CoolException("入库路径不存在");
			}
			// 堆垛机站点(目标站)
			Integer staNo = staDesc.getCrnStn();
			// 更新工作类型103->53
			wrkMast.setIoType(53);
			wrkMast.setWrkSts(52L); // 工作状态42->52.设备上走（拆垛完成）
			// 目标站点源站点转换
			wrkMast.setSourceStaNo(wrkMast.getStaNo());
			wrkMast.setStaNo(staNo);
			// 目标库位=源库位
			wrkMast.setLocNo(wrkMast.getSourceLocNo());
			// 源库位清除
			wrkMast.setSourceLocNo("");
			wrkMast.setModiTime(new Date());

			int outStaNo = 0; // 出库源站点
			if (staNo == 3044 \|\| staNo == 3045) {
			outStaNo = 3046;
			} else if(staNo == 3040 \|\| staNo == 3041) {
			outStaNo = 3042;
			}
			if (outStaNo == 0) {
			throw new CoolException("出库源站点转换有误：" + staNo);
			}

			// 获取出库物料
			List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));

			// 创建桁架理货出库的工作档
			int work = create111Work(wrkMast, wrkDetls, param.getSite(), wrkMast.getStaNo(), param.getBarcode());

			int descFlag = getType(wrkDetls);

			// get0原托盘回流信息，get1拆垛出来物料出库信息
			List<ZphjcdwcVo> zphjcdwcVos = new ArrayList<>();
			ZphjcdwcVo zphjcdwcVo1 = new ZphjcdwcVo();
			zphjcdwcVo1.setWorkNo(wrkMast.getWrkNo());
			zphjcdwcVo1.setStaNo(wrkMast.getStaNo());
			zphjcdwcVo1.setSourceStaNo(wrkMast.getSourceStaNo());
			zphjcdwcVo1.setStaNo(wrkMast.getSourceStaNo());
			zphjcdwcVo1.setSourceStaNo(param.getSourceStaNo());
			zphjcdwcVo1.setBarcode(wrkMast.getBarcode());
			zphjcdwcVos.add(zphjcdwcVo1);

			ZphjcdwcVo zphjcdwcVo2 = new ZphjcdwcVo();
			zphjcdwcVo2.setSourceStaNo(outStaNo);
			zphjcdwcVo2.setStaNo(3106); // 3106/3077
			zphjcdwcVo2.setWorkNo(work);
			zphjcdwcVo2.setSourceStaNo(param.getSite());
			zphjcdwcVo2.setStaNo(wrkMast.getStaNo());
			zphjcdwcVo2.setBarcode(param.getBarcode());
			zphjcdwcVo2.setDescFlag(descFlag);
			zphjcdwcVos.add(zphjcdwcVo2);


			// 保存工作主档历史档
			if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
			throw new CoolException("保存工作主档历史档失败");
			}
			// 获取目标站
			// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
			// .eq("type_no", wrkMast.getIoType() - 50)
			// .eq("stn_no", wrkMast.getSourceStaNo()) // 作业站点 = 拣料出库的目标站
			// .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
			// StaDesc staDesc = staDescService.selectOne(wrapper);
			// if (Cools.isEmpty(staDesc)) {
			// throw new CoolException("入库路径不存在");
			// }
			// 堆垛机站点(目标站)
			// Integer staNo = staDesc.getCrnStn();
			// 更新工作类型103->53
			wrkMast.setIoType(53);
			wrkMast.setWrkSts(52L); // 工作状态42->52.设备上走（拆垛完成）
			// 目标站点源站点转换
			wrkMast.setStaNo(wrkMast.getSourceStaNo());
			wrkMast.setSourceStaNo(param.getSourceStaNo());

			// 目标库位=源库位
			wrkMast.setLocNo(wrkMast.getSourceLocNo());
			// 源库位清除
			wrkMast.setSourceLocNo("");
			wrkMast.setModiTime(new Date());

			// 更新工作主档
			wrkMastService.updateById(wrkMast);
			@@ -1672,12 +1670,54 @@
			}

			/**
			* 创建桁架理货出库的工作档
			*/
			private int create111Work(WrkMast wrk, List<WrkDetl> wrkDetls, Integer site, Integer staNo,String barcode) {
			int workNo = commonService.getWorkNo(4);
			Date now = new Date();
			// 生成工作档
			WrkMast wrkMast = new WrkMast();
			wrkMast.setWrkNo(workNo);
			wrkMast.setIoTime(new Date());
			wrkMast.setWrkSts(2L); // 工作状态：设备上走
			wrkMast.setIoType(111); // 入出库状态：111.理货贴标出库
			wrkMast.setIoPri(13D); // 优先级
			wrkMast.setCrnNo(wrk.getCrnNo());
			wrkMast.setSourceStaNo(site);
			wrkMast.setStaNo(staNo);
			wrkMast.setSourceLocNo(wrk.getSourceLocNo());
			wrkMast.setBarcode(barcode); // 托盘码
			wrkMast.setFullPlt("Y"); // 满板：Y
			wrkMast.setPicking("N"); // 拣料
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk("N"); // 空板
			wrkMast.setLinkMis("Y");
			wrkMast.setCtnType(1); // 容器类型
			// 操作人员数据
			wrkMast.setAppeTime(now);
			wrkMast.setModiTime(now);

			// 插入工作档
			wrkMastService.insert(wrkMast);

			// 插入工作档明细
			for (WrkDetl wrkDetl:wrkDetls) {
			wrkDetl.setWrkNo(workNo);
			wrkDetl.setBarcode(barcode);
			wrkDetl.setZpallet(barcode);
			wrkDetlService.insert(wrkDetl);
			}

			return workNo;
			}

			/**
			* 根据出库物料明细判断是否去贴标(单卷贴标，多卷不贴标)
			* @param wrkDetls 物料明细
			* @return 0.多卷不贴标路径，1.单卷贴标路径
			* @return 1.多卷直接出路径，4.单卷贴标路径
			*/
			private int getType(List<WrkDetl> wrkDetls) {
			return wrkDetls.size() > 1 ? 0 : 1; // 一条记录就是一卷
			return wrkDetls.size() > 1 ? 1 : 4; // 一条记录就是一卷
			}

			public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo,String barcode) {