zy-asrs.git - Gitblit

			@@ -166,6 +166,28 @@
			// return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
			}

			@RequestMapping(value = "/order/wait/detls/pakin/page/auth")
			@ManagerAuth
			public R waitOrderDetls(@RequestParam(defaultValue = "1")Integer curr,
			@RequestParam(defaultValue = "100")Integer limit,
			@RequestParam(required = false)String orderByField,
			@RequestParam(required = false)String orderByType,
			@RequestParam Map<String, Object> param){
			EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
			excludeTrash(param);
			convert(param, wrapper);
			// return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
			List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
			List<Long> docIds = new ArrayList<>();
			for (DocType pakin : pakins) {
			if (pakin.getDocId() == 36) {
			docIds.add(pakin.getDocId());
			}
			}
			wrapper.in("source",docIds);
			return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
			}

			// 所有入库订单明细
			@RequestMapping(value = "/order/bcp/detls/pakin/page/auth")
			@ManagerAuth
			@@ -211,6 +233,32 @@
			Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
			for (OrderDetl record : page.getRecords()) {
			Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(),1);
			record.setStock(sumAnfme == null ? 0 : sumAnfme);
			}
			return R.ok(page);
			}
			@RequestMapping(value = "/order/backStocks/detls/pakin/page/auth")
			@ManagerAuth
			public R backStocksOrderDetls(@RequestParam(defaultValue = "1")Integer curr,
			@RequestParam(defaultValue = "100")Integer limit,
			@RequestParam(required = false)String orderByField,
			@RequestParam(required = false)String orderByType,
			@RequestParam Map<String, Object> param){
			EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
			excludeTrash(param);
			convert(param, wrapper);
			// return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
			List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
			List<Long> docIds = new ArrayList<>();
			for (DocType pakin : pakins) {
			if (pakin.getDocId() == 36) {
			docIds.add(pakin.getDocId());
			}
			}
			wrapper.in("source",docIds);
			Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
			for (OrderDetl record : page.getRecords()) {
			Double sumAnfme = agvLocDetlService.getSumAnfmeback(record.getMatnr(), record.getThreeCode(),1);
			record.setStock(sumAnfme == null ? 0 : sumAnfme);
			}
			return R.ok(page);
			@@ -271,7 +319,17 @@
			throw new CoolException("保存订单主档失败");
			}
			List<DetlDto> list = new ArrayList<>();
			Boolean flag = false;
			for (OrderDetl orderDetl : param.getOrderDetlList()) {
			if (Cools.isEmpty(orderDetl.getProcessSts())) {
			orderDetl.setProcessSts(3);
			}
			if (orderDetl.getProcessSts() == 1) {
			flag = true;
			}
			if (param.getDocType() != 32) {
			orderDetl.setProcessSts(3);
			}
			DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
			if (DetlDto.has(list, dto)) {
			OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
			@@ -360,9 +418,79 @@
			}
			}
			}

			}
			// 工序为1：待加工生成加工单
			if (flag) {
			if (param.getDocType().intValue() == 32) {
			order = new Order(
			String.valueOf(snowflakeIdWorker.nextId()), // 编号[非空]
			"JG" + param.getOrderNo(), // 订单编号
			DateUtils.convert(now), // 单据日期
			35L, // 单据类型
			null, // 项目编号
			null, //
			null, // 调拨项目编号
			null, // 初始票据号
			null, // 票据号
			null, // 客户编号
			null, // 客户
			null, // 联系方式
			null, // 操作人员
			null, // 合计金额
			null, // 优惠率
			null, // 优惠金额
			null, // 销售或采购费用合计
			null, // 实付金额
			null, // 付款类型
			null, // 业务员
			null, // 结算天数
			null, // 邮费支付类型
			null, // 邮费
			null, // 付款时间
			null, // 发货时间
			null, // 物流名称
			null, // 物流单号
			1L, // 订单状态
			1, // 状态
			getUserId(), // 添加人员
			now, // 添加时间
			getUserId(), // 修改人员
			now, // 修改时间
			null // 备注
			);
			if (!orderService.insert(order)) {
			throw new CoolException("生成半成品调拨单失败");
			}
			List<DetlDto> dbList = new ArrayList<>();
			for (OrderDetl orderDetl : param.getOrderDetlList()) {
			if (orderDetl.getProcessSts() != 1) continue;
			DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
			if (DetlDto.has(dbList, dto)) {
			OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
			item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
			if (!orderDetlService.updateById(item)) {
			throw new CoolException("生成半成品调拨单明细档失败");
			}
			} else {
			dbList.add(dto);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setSource(35);
			orderDetl.setCreateBy(getUserId());
			orderDetl.setCreateTime(now);
			orderDetl.setUpdateBy(getUserId());
			orderDetl.setUpdateTime(now);
			orderDetl.setStatus(1);
			orderDetl.setQty(0.0D);
			if (!orderDetlService.insert(orderDetl)) {
			throw new CoolException("生成半成品调拨单明细档失败");
			}
			}
			}


			}
			}
			return R.ok("订单添加成功");
			}

			@@ -405,6 +533,7 @@
			list.add(dto);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setSource(param.getDocType().intValue());
			orderDetl.setCreateBy(getUserId());
			orderDetl.setCreateTime(now);
			orderDetl.setUpdateBy(getUserId());
			@@ -625,6 +754,7 @@
			Date now = new Date();
			DataFormatter dataFormatter = new DataFormatter();
			for (int i = 1; i < totalRows; i++) {
			Integer proSts = 0;
			Row row = sheet.getRow(i);
			//单据类型
			String docName = dataFormatter.formatCellValue(row.getCell(0));
			@@ -641,6 +771,7 @@
			continue;
			}
			Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(5)));

			Mat mat = matService.selectByMatnr(matnr);
			if (null == mat) {
			throw new CoolException(matnr + "商品编码的商品不存在，请重新导入！");
			@@ -649,6 +780,28 @@
			//String timeStr = DateUtils.convert(new Date());

			DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));

			// 单据类型为半成品入库单才有工序
			if (docType.getDocId().intValue() == 32) {
			//工序
			if (Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(6)))) {
			// 工序为空，默认为无需加工
			proSts = 3;
			} else {
			String processSts = dataFormatter.formatCellValue(row.getCell(6));
			//1: 待加工 2：已加工 3：无需加工
			if ("待加工".equals(processSts)) {
			proSts = 1;
			} else if ("已加工".equals(processSts)) {
			proSts = 2;
			} else {
			proSts = 3;
			}
			}
			} else {
			proSts = 3;
			}


			if(docType.getPakin() == 1){
			uuid += "_I";
			@@ -719,6 +872,7 @@
			orderDetl.setDeadTime(isocode);
			orderDetl.setStatus(1);
			orderDetl.setQty(0.0D);
			orderDetl.setProcessSts(proSts);
			if (!orderDetlService.insert(orderDetl)) {
			throw new CoolException("生成单据明细失败，请重新导入！");
			}
			@@ -727,6 +881,7 @@
			throw new CoolException("生成单据明细失败，请重新导入！");
			}
			}
			// 生成调拨单
			if (docType.getDocId().intValue() == 32) {
			String dbUuid = "DB" + uuid;
			Order order2 = orderService.selectByNo(dbUuid);
			@@ -792,6 +947,7 @@
			orderDetl2.setDeadTime(isocode);
			orderDetl2.setStatus(1);
			orderDetl2.setQty(0.0D);
			orderDetl2.setProcessSts(proSts);
			if (!orderDetlService.insert(orderDetl2)) {
			throw new CoolException("生成单据明细失败，请重新导入！");
			}
			@@ -801,6 +957,86 @@
			}
			}
			}

			// 工序为1：待加工生成加工单
			if (proSts == 1) {
			if (docType.getDocId().intValue() == 32) {
			String dbUuid = "JG" + uuid;
			Order order3 = orderService.selectByNo(dbUuid);
			if (null == order3) {
			order3 = new Order(
			String.valueOf(snowflakeIdWorker.nextId()), // 编号[非空]
			dbUuid, // 订单编号
			null, // 单据日期
			35L, // 单据类型
			null, // 项目编号
			null, //
			null, // 调拨项目编号
			null, // 初始票据号
			null, // 票据号
			null, // 客户编号
			null, // 客户
			null, // 联系方式
			null, // 操作人员
			null, // 合计金额
			null, // 优惠率
			null, // 优惠金额
			null, // 销售或采购费用合计
			null, // 实付金额
			null, // 付款类型
			null, // 业务员
			null, // 结算天数
			null, // 邮费支付类型
			null, // 邮费
			null, // 付款时间
			null, // 发货时间
			null, // 物流名称
			null, // 物流单号
			1L, // 订单状态
			1, // 状态
			userId, // 添加人员
			now, // 添加时间
			userId, // 修改人员
			now, // 修改时间
			null // 备注
			);
			if (!orderService.insert(order3)) {
			throw new CoolException("生成单据主档失败，请重新导入！");
			}
			}else {
			order3.setSettle(order.getSettle() == 1L ? 1L : 2L );
			orderService.updateById(order3);
			}

			OrderDetl orderDetl3 = orderDetlService.selectItem(order3.getId(), matnr, null,csocode,isocode);
			if (orderDetl3 == null) {
			orderDetl3 = new OrderDetl();
			orderDetl3.sync(mat);
			orderDetl3.setSource(35);
			orderDetl3.setBatch(null);
			orderDetl3.setAnfme(anfme);
			orderDetl3.setOrderId(order3.getId());
			orderDetl3.setOrderNo(order3.getOrderNo());
			orderDetl3.setCreateBy(userId);
			orderDetl3.setCreateTime(now);
			orderDetl3.setUpdateBy(userId);
			orderDetl3.setUpdateTime(now);
			orderDetl3.setThreeCode(csocode);
			orderDetl3.setDeadTime(isocode);
			orderDetl3.setStatus(1);
			orderDetl3.setQty(0.0D);
			orderDetl3.setProcessSts(proSts);
			if (!orderDetlService.insert(orderDetl3)) {
			throw new CoolException("生成单据明细失败，请重新导入！");
			}
			} else {
			if(!orderDetlService.increaseAnfme(order3.getId(), matnr, null, anfme,csocode,isocode)) {
			throw new CoolException("生成单据明细失败，请重新导入！");
			}
			}
			}
			}

			}
			return R.ok("导入成功");
			}