ERP_override.git

			@@ -113,8 +113,8 @@
			if (!flowCardlist.isEmpty()){
			//获取单号
			String oddNumber= orderNumberSetting("入库");
			for (FlowCard flowCard : flowCardlist) {

			for (FlowCard flowCards : flowCardlist) {
			FlowCard flowCard = finishedGoodsInventoryMapper.getSelectWarehousingByProcessId(flowCards.getOrder().getOrderId(),flowCards.getOrderNumber(),flowCards.getProcessId());
			Integer calculateType=flowCard.getOrder().getCalculateType();
			double deliveryDetailMoney = 0.0;
			double deliveryDetailArea = 0.0;
			@@ -854,7 +854,7 @@
			}

			Map<String, Object> itemmap = new HashMap<>();
			itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks()));
			itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrder().getCustomerName(),finishedOperateLog.getOrder().getProject(),finishedOperateLog.getRemarks()));

			List<Map<String, Object>> detailList = finishedOperateLogMapper.getDetailList2(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks());

			@@ -863,7 +863,18 @@
			for(Map<String, Object> details:detailList){
			Map<String, Object> detailsmap = new HashMap<>();
			detailsmap.put("product_name",details.get("product_name").toString());
			detailsmap.put("detailList",finishedOperateLogMapper.getDetailLists(finishedOperateLog.getOrderId(),finishedOperateLog.getRemarks(), Integer.valueOf(details.get("product_id").toString())));
			List<Map<String, Object>> orderDetailList = finishedOperateLogMapper
			.getDetailLists(
			finishedOperateLog.getOrderId(),
			finishedOperateLog.getRemarks(),
			Integer.valueOf(details.get("product_id").toString()),
			details.get("thickness").toString()
			);
			/*for (Map<String, Object>orderDetail:orderDetailList){

			}*/

			detailsmap.put("detailList",orderDetailList);
			detailsmaplist.add(detailsmap);

			}