zs-mes-after.git

			@@ -5,7 +5,6 @@
			import cn.hutool.core.io.FileUtil;
			import cn.hutool.core.io.IoUtil;
			import cn.hutool.core.util.BooleanUtil;
			import cn.hutool.core.util.IdUtil;
			import cn.hutool.core.util.StrUtil;
			import cn.hutool.http.HttpRequest;
			import com.alibaba.excel.EasyExcel;
			@@ -37,7 +36,6 @@
			import com.chinaztt.mes.common.oa.OAResult;
			import com.chinaztt.mes.common.util.StateResult;
			import com.chinaztt.mes.common.util.WechatMsgTips;
			import com.chinaztt.mes.common.util.easyexcel.EasyExcelUtils;
			import com.chinaztt.mes.common.wechat.WechatProperty;
			import com.chinaztt.mes.plan.dto.*;
			import com.chinaztt.mes.plan.entity.*;
			@@ -288,42 +286,17 @@


			@Override
			public R fullUpdate(CustomerOrderDTO customerOrderDTO) {
			List<String> unitWhitMapList = customerOrderUnitWhiteListConfig.getUnitWhitListMap();
			String unitConcat = customerOrderDTO.getOtcUnit() + "_" + customerOrderDTO.getIfsSalesUnit();
			if (!customerOrderDTO.getOtcUnit().equals(customerOrderDTO.getIfsSalesUnit()) && !unitWhitMapList.contains(unitConcat)) {
			//如果销售单位和ifs中销售单位不一样则不给保存A
			return R.failed("订单行销售单位和销售件销售计量单位不一致并且白名单中不存在对应关系");
			} else {
			if (StringUtils.isNotBlank(customerOrderDTO.getPartNo())) {
			Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getPartNo()));
			if (null == part) {
			throw new RuntimeException("根据零件编号 = 【" + customerOrderDTO.getPartNo() + "】MES本地查无匹配零件对象");
			}
			}
			if (StringUtils.isNotBlank(customerOrderDTO.getSalesPartNo())) {
			Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getSalesPartNo()));
			if (null == part) {
			throw new RuntimeException("根据销售件编号 = 【" + customerOrderDTO.getSalesPartNo() + "】MES本地查无匹配零件对象");
			}
			}
			// 如果销售零件号未修改，otc同步状态不需要更新
			CustomerOrder oriCustomerOrder = customerOrderMapper.selectById(customerOrderDTO.getId());
			if (!org.apache.commons.lang3.StringUtils.equals(oriCustomerOrder.getSalesPartNo(),
			customerOrderDTO.getSalesPartNo())) {
			customerOrderDTO.setOtcPartSync(false);
			}
			//mes数量 = 订单数量 * 因子
			Assert.notNull(customerOrderDTO.getIfsConvFactor(), "请选择销售零件号");
			customerOrderDTO.setBuyQtyDue(customerOrderDTO.getIfsConvFactor().multiply(customerOrderDTO.getOtcQuantity()));
			if (BooleanUtil.isTrue(customerOrderDTO.getIsDocument())) {
			customerOrderDTO.setCoState(CustomerOrderStateStringValues.PLAN);
			} else {
			customerOrderDTO.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
			}
			updateById(customerOrderDTO);
			return R.ok();
			}
			public R fullUpdate(CustomerOrderVO1 customerOrderVO1) {
			CustomerOrder customerOrder = new CustomerOrder();
			BeanUtils.copyProperties(customerOrderVO1,customerOrder);
			customerOrder.setId(customerOrderVO1.getId());
			customerOrderMapper.updateById(customerOrder);

			Customer customer = new Customer();
			BeanUtils.copyProperties(customerOrderVO1,customer);
			customer.setId(customerOrderMapper.selectById(customerOrderVO1.getId()).getCustomerId());
			customerMapper.updateById(customer);
			return R.ok("修改成功!");
			}

			@Override
			@@ -398,18 +371,28 @@
			// }
			//保存主生产计划
			MasterProductionSchedule masterProductionSchedule = new MasterProductionSchedule();
			//主生产计划号
			masterProductionSchedule.setMpsNo(scheduleNumberGenerator.generateNumberWithPrefix(MasterProductionSchedule.DIGIT, MasterProductionSchedule.PREFIX, MasterProductionSchedule::getMpsNo));
			masterProductionSchedule.setPartId(customerOrderDTO.getPartId());
			Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getPartNo()));
			//零件id
			masterProductionSchedule.setPartId(part.getId());
			//将审核状态和工艺文件的id同步给生产计划
			masterProductionSchedule.setIsAudit(customerOrderDTO.getIsAudit());
			masterProductionSchedule.setTechnologyDocumentId(customerOrderDTO.getTechnologyDocumentId());
			masterProductionSchedule.setManufactureAttr(customerOrderDTO.getManufactureAttr());
			masterProductionSchedule.setDocNumber(customerOrderDTO.getDocNumber());
			//需求数量
			masterProductionSchedule.setQtyRequired(qta);
			//需求日期
			masterProductionSchedule.setRequiredDate(customerOrderDTO.getDeliveryDate());
			//备注
			masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
			masterProductionSchedule.setQtyRequired(qta);
			masterProductionSchedule.setRequiredDate(customerOrderDTO.getWantedDeliveryDate());
			masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
			masterProductionSchedule.setSource("销售订单");
			masterProductionScheduleMapper.insert(masterProductionSchedule);
			customerOrderDTO.setRequireNumber(customerOrderDTO.getQtyPlaned());

			// if (CollectionUtil.isNotEmpty(operationTaskProduceList)) {
			// for (OperationTaskProduce operationTaskProduce : operationTaskProduceList) {
			@@ -436,6 +419,7 @@
			return true;
			}

			//多个销售订单创建一个主生产计划
			@Override
			public MasterProductionSchedule createOneMasterProductionScheduleByCustomerOrders(List<CustomerOrderDTO> customerOrders) {
			List<Long> ids = customerOrders.stream().map(CustomerOrderDTO::getId).collect(Collectors.toList());
			@@ -597,17 +581,20 @@
			return R.failed("工艺文件缺失");
			}
			List<CustomerOrder> customerOrderList = baseMapper.selectBatchIds(ids);
			customerOrderList.forEach(l->{
			log.info("关联数据==============================>"+l);
			});
			String msg = "";
			for (CustomerOrder customerOrder : customerOrderList) {
			if (BooleanUtil.isTrue(customerOrder.getIsDocument())) {
			msg += customerOrder.getCustomerOrderNo() + "已关联工艺文件！";
			}
			if (StringUtils.isBlank(customerOrder.getSalesPartNo())) {
			if (StringUtils.isBlank(customerOrder.getPartNo())) {
			msg += customerOrder.getCustomerOrderNo() + "未选择销售件！";
			}
			if (StringUtils.isBlank(customerOrder.getPartNo())) {
			customerOrder.setPartNo(document.getPartNo());
			}
			//if (StringUtils.isBlank(customerOrder.getPartNo())) {
			// customerOrder.setPartNo(document.getPartNo());
			//}
			customerOrder.setIsDocument(true);
			customerOrder.setCoState(CustomerOrderStateStringValues.PLAN);
			customerOrder.setTechnologyDocumentId(docId);
			@@ -697,9 +684,6 @@
			.contentType("application/json")
			.header("Authorization", "Bearer " + token).form(map).execute().body();
			JSONObject result = JSONObject.parseObject(str);
			//JSONArray jsonArray = result.getJSONArray("data");
			//jsonArray.forEach();
			//return null;
			//主表参数表
			List<OrderParam> orderParams = orderParamService.list();
			if (result.getInteger("code") == 0) {
			@@ -824,7 +808,7 @@
			customerOrder = new CustomerOrder();
			}
			//如果这个单子在OTC中取消状态那就删除
			if (otcOrderStatus.equals("已取消")) {
			if (otcOrderStatus.equals(OTC_MAIN_STATUS_CANCEL)) {
			if (customerOrder.getId() != null) {
			baseMapper.deleteById(customerOrder.getId());
			}
			@@ -912,7 +896,7 @@
			} else {
			customerOrder.setCoState(CustomerOrderStateStringValues.PARTUNCHECKED);
			}
			if (org.apache.commons.lang3.StringUtils.equals("已下达", otcMainStatus)) {
			if (org.apache.commons.lang3.StringUtils.equals(OTC_MAIN_STATUS_TRANSMIT, otcMainStatus)) {
			customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
			customerOrder.setOtcPartSync(Boolean.TRUE);
			}
			@@ -921,8 +905,8 @@
			customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
			customerOrder.setOtcPartSync(Boolean.TRUE);
			}
			//审核状态为 01draft 草稿
			customerOrder.setIsAudit(AuditStateStringValues.DRAFT);
			//审核状态为 03accepted 通过
			customerOrder.setIsAudit(AuditStateStringValues.ACCEPTED);
			baseMapper.insert(customerOrder);
			}
			addCustomerPara(customerJSONObject, customerOrderJSONObject, customerOrder, orderParamList);
			@@ -1913,7 +1897,6 @@
			try {
			String path = FileSaveUtil.FILE_PATH + bucket;
			InputStream inputStream = new FileInputStream(path);
			// EasyExcel.write(path).sheet().doWrite(null);
			response.setContentType("application/octet-stream; charset=UTF-8");
			IoUtil.copy(inputStream, response.getOutputStream());
			} catch (Exception e) {