ERP_override.git

			@@ -5,7 +5,6 @@
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.example.erp.common.Constants;
			import com.example.erp.entity.pp.FlowCard;
			import com.example.erp.entity.sd.OrderGlassDetail;
			@@ -86,6 +85,8 @@
			flowCardMapper.deleteReportingWork(processId);
			//删除分架明细
			flowCardMapper.deleteFlowCardMp(orderId, processId);
			//删除排序表数据
			flowCardMapper.deleteflowCardSort(orderId, processId);
			//判断该订单流程卡是否全部删除
			Integer flowNumber = flowCardMapper.selectFlowCardCount(orderId);
			if (flowNumber == 0) {
			@@ -684,7 +685,8 @@

			}

			public List<FlowCard> getProcessCard(String processCard) {
			public List<FlowCard> getProcessCard(Map<String, String> processCards) {
			String processCard = processCards.get("processCard");
			if(!processCard.contains("/")){
			throw new ServiceException(Constants.Code_600, "错误的流程卡号，请检查!");
			}
			@@ -714,6 +716,52 @@
			return flowCardList;
			}

			public Boolean checkboxDeleteSv(Map<String, Object> object) {
			String userName = "";
			if (object.get("userName") != null) {
			userName = object.get("userName").toString();
			}
			String userId = "";
			if (object.get("userId") != null) {
			userId = object.get("userId").toString();
			}
			List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
			for (FlowCard flowCard : flowCardList) {
			Integer count = flowCardMapper.reportingWorkCount(flowCard.getProcessId());
			if (count == 0) {
			//修改分架状态
			flowCardMapper.updateDeleteState(flowCard.getOrderId(), flowCard.getProcessId());
			//删除报工流程明细表数据
			flowCardMapper.deleteReportingWork(flowCard.getProcessId());
			//删除分架明细
			flowCardMapper.deleteFlowCardMp(flowCard.getOrderId(), flowCard.getProcessId());
			//删除排序表数据
			flowCardMapper.deleteflowCardSort(flowCard.getOrderId(), flowCard.getProcessId());
			//判断该订单流程卡是否全部删除
			Integer flowNumber = flowCardMapper.selectFlowCardCount(flowCard.getOrderId());
			if (flowNumber == 0) {
			//修改订单表分架状态为0,全部删除
			flowCardMapper.updateProcessingCard(flowCard.getOrderId(), 0);
			} else {
			//修改订单表分架状态为1,删除部分
			flowCardMapper.updateProcessingCard(flowCard.getOrderId(), 1);
			}

			//保存日志
			Log log = new Log();
			log.setContent(flowCard.getOrderId()+flowCard.getProcessId());
			log.setFunction("checkboxDeleteSv流程卡删除");
			log.setOperatorId(userId);
			log.setOperator(userName);
			logService.saveLog(log);
			} else {
			return false;
			}
			}
			return true;


			}
			}