zy-asrs.git - Gitblit

			@@ -27,7 +27,6 @@

			import java.util.*;
			import java.util.concurrent.TimeUnit;
			import java.util.stream.Collectors;

			/**
			* Created by vincent on 2020/6/11
			@@ -45,6 +44,8 @@
			private MatService matService;
			@Autowired
			private WrkMastService wrkMastService;
			@Autowired
			private DocTypeService docTypeService;
			@Autowired
			private WrkDetlService wrkDetlService;
			@Autowired
			@@ -91,7 +92,7 @@
			// 检索库位
			LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
			// List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
			StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), null, locTypeDto, 0);
			StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), param.getList().get(0).getMatnr(),null,null, locTypeDto);
			// 生成工作号
			int workNo = dto.getWorkNo();
			// 生成工作档
			@@ -164,7 +165,7 @@
			for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
			if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
			LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
			if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
			if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
			}
			}
			if (!locDetlDtos.isEmpty()) {
			@@ -179,6 +180,107 @@
			throw new CoolException("库存不存在");
			}
			}
			@Override
			@Transactional
			public void startupFullTakeStoreOrder(StockOutParam param, Long userId) {
			if (Cools.isEmpty(param) \|\| Cools.isEmpty(param.getLocDetls())){
			throw new CoolException("参数为空");
			}
			if (Cools.isEmpty(param.getOrderNo())){
			throw new CoolException("订单号参数为空");
			}
			DocType docType = docTypeService.selectOrAdd("手动出库单", Boolean.FALSE);
			Order order = orderService.selectByNo(param.getOrderNo());
			if (Cools.isEmpty(order)){
			Date now = new Date();
			order = new Order(
			String.valueOf(snowflakeIdWorker.nextId()), // 编号[非空]
			param.getOrderNo(), // 订单编号
			DateUtils.convert(now), // 单据日期
			docType.getDocId(), // 单据类型
			null, // 项目编号
			null, //
			null, // 调拨项目编号
			null, // 初始票据号
			null, // 票据号
			null, // 客户编号
			null, // 客户
			null, // 联系方式
			null, // 操作人员
			null, // 合计金额
			null, // 优惠率
			null, // 优惠金额
			null, // 销售或采购费用合计
			null, // 实付金额
			null, // 付款类型
			null, // 业务员
			null, // 结算天数
			null, // 邮费支付类型
			null, // 邮费
			null, // 付款时间
			null, // 发货时间
			null, // 物流名称
			null, // 物流单号
			// 2L, // 订单状态
			1L, // 订单状态
			1, // 状态
			userId, // 添加人员
			now, // 添加时间
			userId, // 修改人员
			now, // 修改时间
			null // 备注
			);
			if (!orderService.insert(order)) {
			throw new CoolException("保存订单主档失败");
			}
			// 单据明细档
			List<DetlDto> list = new ArrayList<>();
			List<StockOutParam.LocDetl> locDetls = param.getLocDetls();
			int i=0;
			for (StockOutParam.LocDetl locDetl : locDetls) {
			i++;
			Mat mat = matService.selectByMatnr(locDetl.getMatnr());
			if (Cools.isEmpty(mat)) {
			throw new CoolException(locDetl.getMatnr() + "物料编码检索失败，请先添加商品");
			}
			OrderDetl orderDetl = new OrderDetl();
			orderDetl.sync(mat);
			orderDetl.setSuppCode(String.valueOf(i)); // 行号
			orderDetl.setManu(locDetl.getLocNo()); //库位号
			orderDetl.setBatch(locDetl.getBatch()); //木箱编码
			orderDetl.setAnfme(locDetl.getAnfme());//出库数量
			orderDetl.setModel(locDetl.getModel());//批次
			orderDetl.setSpecs(locDetl.getSpecs());//规格
			orderDetl.setBrand(locDetl.getBrand());//木箱类型
			orderDetl.setBarcode(locDetl.getZpallet());//木箱类型
			orderDetl.setWeight(locDetl.getWeight());
			// orderDetl.setWorkQty(locDetl.getAnfme());
			orderDetl.setWorkQty(0.0);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setOrigin(locDetl.getOrigin());
			orderDetl.setCreateBy(userId);
			orderDetl.setCreateTime(now);
			orderDetl.setUpdateBy(userId);
			orderDetl.setUpdateTime(now);
			orderDetl.setStatus(1);
			orderDetl.setQty(0.0D);
			if (!orderDetlService.insert(orderDetl)) {
			throw new CoolException("生成单据明细失败，请联系管理员");
			}
			}

			// List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
			// for (StockOutParam stockOutParam : stockOutParams){
			// startupFullTakeStore(stockOutParam,userId);
			// }

			} else {
			throw new CoolException("订单号重复，订单"+param.getOrderNo()+"已存在！！！");
			}

			}


			@Override
			@Transactional
			@@ -240,6 +342,10 @@
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk("N"); // 空板
			wrkMast.setLinkMis("N");
			wrkMast.setSheetNo("0");
			if (staDesc.getStnNo()<118 \|\| staDesc.getStnNo()>121){
			wrkMast.setSheetNo("3");
			}
			wrkMast.setBarcode(locMast.getBarcode());
			wrkMast.setAppeUser(userId); // 操作人员数据
			wrkMast.setAppeTime(now);
			@@ -253,7 +359,7 @@
			if (detlDto.getCount()==null \|\| detlDto.getCount() <= 0.0D) {continue;}
			WrkDetl wrkDetl = new WrkDetl();
			wrkDetl.sync(detlDto.getLocDetl());
			wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号
			wrkDetl.setOrderNo(detlDto.getOrderNo()); // 手动出库不需要带出库存中的单据编号
			wrkDetl.setWrkNo(workNo);
			wrkDetl.setIoTime(now);
			Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
			@@ -295,7 +401,48 @@
			LocMast locMast = locMastService.selectById(taskDto.getLocNo());
			// 获取路径
			int ioType = taskDto.isAll() ? 101 : 103;
			StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
			// StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
			// 根据库位排号+出库站点，获取出库源站点
			int row = Integer.parseInt(locMast.getLocNo().substring(0, 2));
			int souresStaNo = 0;
			if (taskDto.getStaNo() < 3000) { // 二楼
			switch (row) {
			case 1: case 2: case 3:
			case 4: souresStaNo = 2062; break;
			case 5: case 6: case 7:
			case 8: souresStaNo = 2065; break;
			case 9: case 10: case 11:
			case 12: souresStaNo = 2068; break;
			case 13: case 14: case 15:
			case 16: souresStaNo = 2070; break;
			case 17: case 18: case 19:
			case 20: souresStaNo = 2073; break;
			case 21: case 22: case 23:
			case 24: souresStaNo = 2076; break;
			default:
			}
			} else { // 一楼
			switch (row) {
			case 1: case 2: case 3:
			case 4: souresStaNo = 3002; break;
			case 5: case 6: case 7:
			case 8: souresStaNo = 3003; break;
			case 9: case 10: case 11:
			case 12: souresStaNo = 3006; break;
			case 13: case 14: case 15:
			case 16: souresStaNo = 3008; break;
			case 17: case 18: case 19:
			case 20: souresStaNo = 3009; break;
			case 21: case 22: case 23:
			case 24: souresStaNo = 3012; break;
			default:
			}
			}

			if (souresStaNo == 0) {
			throw new CoolException("源站点转换异常：" + row);
			}

			// 生成工作号
			int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
			// 生成工作档
			@@ -306,8 +453,8 @@
			wrkMast.setIoType(ioType); // 入出库状态
			wrkMast.setIoPri(13D); // 优先级：13
			wrkMast.setCrnNo(locMast.getCrnNo());
			wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
			wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
			wrkMast.setSourceStaNo(souresStaNo); // 源站
			wrkMast.setStaNo(taskDto.getStaNo()); // 目标站
			wrkMast.setSourceLocNo(taskDto.getLocNo()); // 源库位
			wrkMast.setFullPlt("Y"); // 满板：Y
			wrkMast.setPicking("N"); // 拣料
			@@ -330,9 +477,17 @@
			orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
			}
			WrkDetl wrkDetl = new WrkDetl();
			wrkDetl.sync(orderDetl);
			// wrkDetl.sync(orderDetl);
			wrkDetl.setZpallet(wrkMast.getBarcode());
			wrkDetl.setIoTime(now);
			wrkDetl.setMatnr(locDto.getMatnr());
			wrkDetl.setMaktx(locDto.getMaktx());
			wrkDetl.setWeight(locDto.getWeight()); // 净重
			wrkDetl.setVolume(locDto.getVolume()); // 毛重
			wrkDetl.setOrigin(locDto.getOrigin()); // 木箱在托盘位置
			wrkDetl.setPrice(locDto.getPrice());
			wrkDetl.setSpecs(locDto.getSpecs());
			wrkDetl.setModel(locDto.getModel());
			wrkDetl.setWrkNo(workNo);
			wrkDetl.setBatch(locDto.getBatch());
			wrkDetl.setOrderNo(locDto.getOrderNo());
			@@ -371,7 +526,7 @@
			BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
			// 检索库位
			LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
			StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
			StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,null, locTypeDto);
			int workNo = dto.getWorkNo();
			Date now = new Date();
			// 生成工作档
			@@ -560,7 +715,7 @@
			for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
			if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
			LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
			if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
			if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(),param.getOrderNo()));
			}
			}
			if (!locDetlDtos.isEmpty()) {
			@@ -674,14 +829,17 @@
			if (wrkMast.getWrkSts() < 4 \|\| (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
			wrkMast.setWrkSts(4L);
			// 出库
			} else if (wrkMast.getWrkSts() > 10) {
			} else if (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()!=202) {
			wrkMast.setWrkSts(14L);
			}else if (wrkMast.getIoType()==202){
			wrkMast.setWrkSts(57L);
			}
			Date now = new Date();
			wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			wrkMast.setModiUser(userId);
			wrkMast.setSheetNo("3");
			// 完成操作人员记录
			wrkMast.setManuType("手动完成");
			if (!wrkMastService.updateById(wrkMast)) {
			@@ -838,7 +996,7 @@
			locMastService.updateById(locMast);
			}
			// 出库取消（修改源库位）
			} else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
			} else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14 && wrkMast.getIoType()!=202) {
			locNo = wrkMast.getSourceLocNo();
			// 出库 ===>> F.在库
			if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
			@@ -859,6 +1017,7 @@
			locMast.setModiUser(userId);
			locMastService.updateById(locMast);
			}
			} else if (wrkMast.getIoType()==202 \|\| wrkMast.getIoType()==212){
			} else {
			throw new CoolException("当前工作状态无法取消");
			}
			@@ -945,6 +1104,9 @@
			}
			// 删除工作档明细
			boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
			}
			if (wrkMast.getIoType()==202 \|\| wrkMast.getIoType()==212){
			return;
			}

			// 修改库位状态
			@@ -1132,7 +1294,7 @@
			}
			List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getLocDetls().get(0).getMatnr()));
			if (Cools.isEmpty(locDetls) \|\| locDetls.size()<1){
			throw new CoolException("待修改商品无库存，无需修改！品号："+param.getLocDetls().get(0).getMatnr());
			throw new CoolException("待修改商品无库存，无需修改！规格："+param.getLocDetls().get(0).getMatnr());
			}
			try {
			locDetlService.updateMatTurn(param.getLocDetls().get(0).getMatnr(),mat.getMatnr());