ERP_override.git

			@@ -19,6 +19,7 @@
			import com.fasterxml.jackson.databind.ObjectMapper;
			import org.springframework.stereotype.Service;

			import java.time.LocalDate;
			import java.util.List;
			import java.util.Map;

			@@ -29,6 +30,7 @@
			import java.sql.Date;
			import java.util.*;
			import java.util.stream.Collectors;
			import java.util.stream.IntStream;

			import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;

			@@ -52,11 +54,25 @@
			}

			//流程卡管理查询
			public Map<String, Object> selectProcessCard(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard) {
			public Map<String, Object> selectProcessCard(Integer pageNum, Integer pageSize,List<String> selectDate, FlowCard flowCard) {
			Integer offset = (pageNum - 1) * pageSize;
			String endDate = LocalDate.now().toString();
			String startDate = LocalDate.now().minusDays(15).toString();
			if(selectDate !=null && selectDate.size()==2){
			if(!selectDate.get(0).isEmpty()){
			startDate = selectDate.get(0);
			}
			if(!selectDate.get(1).isEmpty()){
			endDate = selectDate.get(1);
			}
			}
			Map<String, Object> map = new HashMap<>();
			map.put("data", flowCardMapper.selectFlowCard(offset, pageSize, selectTime1, selectTime2, flowCard));
			map.put("total", flowCardMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, flowCard));
			map.put("data", flowCardMapper.selectFlowCard(offset, pageSize, startDate, endDate, flowCard));
			map.put("total", flowCardMapper.getPageTotal(offset, pageSize, startDate, endDate, flowCard));
			List<String> list = new ArrayList<>();
			list.add(startDate);
			list.add(endDate);
			map.put("selectDate",list);
			return map;
			}

			@@ -216,6 +232,7 @@
			public Object flowCardDetailSv(String processId, FlowCard flowCard) {
			Map<String, Object> map = new HashMap<>();
			map.put("data", flowCardMapper.flowCardDetailMp(processId, flowCard));
			map.put("merge", flowCardMapper.flowCardDetailMergeMp(processId));
			return map;
			}

			@@ -863,23 +880,27 @@

			}

			public String mergeFlowCard(Map<String, Object> object) {
			public String mergeFlowCard(Map<String, Object> object, Integer merge) {
			String returns = "false";
			List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
			if (!flowCardList.isEmpty()) {
			List<Map<String, Object>> flowCardList1 = flowCardMapper.selectFlowCardMerge(flowCardList.get(0).getProcessId());
			int index = 1;
			for (int i = 0; i < flowCardList1.size(); i++) {
			if (Integer.valueOf(flowCardList1.get(i).get("count2").toString()) > 1) {
			List<Integer> technologyNumber = Arrays.stream(flowCardList1.get(i).get("count1").toString().split(","))
			.map(Integer::parseInt)
			.collect(Collectors.toList());
			flowCardMapper.updateFlowCardMerge(flowCardList.get(0).getProcessId(), technologyNumber, index);
			index += 1;
			returns = "true";
			if (merge == 0){
			int index = 1;
			for (int i = 0; i < flowCardList1.size(); i++) {
			if (Integer.valueOf(flowCardList1.get(i).get("count2").toString()) > 1) {
			List<Integer> technologyNumber = Arrays.stream(flowCardList1.get(i).get("count1").toString().split(","))
			.map(Integer::parseInt)
			.collect(Collectors.toList());
			flowCardMapper.updateFlowCardMerge(flowCardList.get(0).getProcessId(), technologyNumber, index);
			index += 1;
			returns = "true";
			}
			}
			}else {//取消合并
			flowCardMapper.updateFlowCardIsMerge(flowCardList.get(0).getProcessId());
			returns = "true";
			}


			}

			@@ -895,11 +916,14 @@
			}

			String[] processCardList = processCard.split("/");
			List<String> result = IntStream.range(0, processCardList[1].length())
			.mapToObj(i -> String.valueOf(processCardList[1].charAt(i)))
			.collect(Collectors.toList());

			List<FlowCard> flowCardList = flowCardMapper.selectList(
			new QueryWrapper<FlowCard>()
			.eq("process_id", processCardList[0])
			.eq("technology_number", processCardList[1])
			.in("technology_number", result)
			);
			for (FlowCard flowCard : flowCardList) {
			flowCard.setOrderGlassDetail(
			@@ -1091,8 +1115,8 @@
			Float glassThickness = Float.parseFloat(thickness.get("thickness").toString());

			//获取此工程号订单明细信息
			List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"scope",inLenMax,inLenMin,inShortMax,inShortMin);
			List<OrderDetail> orderDetailsNotScope = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"notScope",inLenMax,inLenMin,inShortMax,inShortMin);
			List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"scope",inLenMax,inLenMin,inShortMax,inShortMin,glassThickness);
			List<OrderDetail> orderDetailsNotScope = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"notScope",inLenMax,inLenMin,inShortMax,inShortMin,glassThickness);

			//根据玻璃厚度和垫片厚度当前架子最大可放数量
			Integer shelfMaxQuantityByThickness = (int) (shelfThickness / (glassTotalThickness + spacerThickness));
			@@ -1170,6 +1194,7 @@
			newOrderDetail.setLandingSequence(flowCardNo);
			orderDetailList.add(newOrderDetail);
			orderDetail.setQuantity(orderDetail.getQuantity() - shelfQuantity);
			orderDetail.setBaiscQuantity(String.valueOf(Integer.valueOf(orderDetail.getBaiscQuantity())-shelfQuantity));
			flowCardNo += 1;
			shelfQuantity = shelfQuantity - shelfQuantity;
			} else {
			@@ -1180,6 +1205,7 @@
			newOrderDetail.setOrderNumber(orderDetail.getOrderNumber());
			newOrderDetail.setShape(orderDetail.getShape());
			newOrderDetail.setLandingSequence(flowCardNo);
			newOrderDetail.setBaiscQuantity(String.valueOf(orderDetail.getBaiscQuantity()));
			orderDetailList.add(newOrderDetail);
			//当前架子剩余数量
			shelfQuantity = shelfQuantity - Math.toIntExact(orderDetail.getQuantity());