ERP_override.git

			@@ -4,6 +4,7 @@
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.example.erp.entity.mm.*;
			import com.example.erp.entity.pp.OptimizeUse;
			import com.example.erp.entity.sd.Delivery;
			import com.example.erp.entity.sd.DeliveryDetail;
			import com.example.erp.entity.sd.OrderDetail;
			@@ -54,8 +55,14 @@
			List<MaterialOutboundDetail> materialOutboundDetailLists = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
			if (!materialOutboundDetailLists.isEmpty()) {
			for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailLists) {
			//还原物料库存数
			materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
			if(materialOutboundDetail.getUseId()!=null){
			//还原优化工程库存数
			materialInventoryMapper.updateMaterialInventoryAvailableOptInt(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
			}else{
			//还原物料库存数
			materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
			}

			}
			}
			//删除材料出库明细的数据
			@@ -76,9 +83,14 @@
			Integer materialOutboundDetailMaximum = materialInventoryMapper.getMaterialOutboundDetailMaximum(oddNumber);
			//新增材料出库明细数据
			materialInventoryMapper.insertMaterialOutboundDetail(materialOutboundDetail, oddNumber, materialOutboundDetailMaximum + 1);
			//修改物料库存表出库数量
			System.out.println(materialOutboundDetail.getInventoryId());
			materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
			if(materialOutboundDetail.getUseId()!=null){
			//修改优化工程表出库数量
			materialInventoryMapper.updateMaterialInventoryAvailableOptOut(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
			}else{
			//修改物料库存表出库数量
			materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
			}


			}

			@@ -149,12 +161,43 @@
			return map;
			}

			public Map<String, Object> getSelectMaterialInventoryEngineeringDate(Integer pageNum, Integer pageSize, List<String> selectDate, MaterialInventory materialInventory) {
			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", materialInventoryMapper.getSelectMaterialInventoryEngineeringDate(offset, pageSize,startDate, endDate, materialInventory));
			map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringDatePageTotal(offset, pageSize,startDate, endDate, materialInventory));
			List<String> list = new ArrayList<>();
			list.add(startDate);
			list.add(endDate);
			map.put("selectDate",list);
			return map;
			}

			public Map<String, Object> getSelectMaterialInventory(Integer pageNum, Integer pageSize, MaterialInventory materialInventory) {
			Integer offset = (pageNum - 1) * pageSize;

			Map<String, Object> map = new HashMap<>();
			map.put("data", materialInventoryMapper.getSelectMaterialInventory(offset, pageSize, materialInventory));
			map.put("total", materialInventoryMapper.getSelectMaterialInventoryPageTotal(offset, pageSize, materialInventory));
			return map;
			}

			public Map<String, Object> getSelectMaterialInventoryEngineering(Integer pageNum, Integer pageSize, OptimizeUse optimizeUse) {
			Integer offset = (pageNum - 1) * pageSize;
			System.out.println(optimizeUse);
			Map<String, Object> map = new HashMap<>();
			map.put("data", materialInventoryMapper.getSelectMaterialInventoryEngineering(offset, pageSize, optimizeUse));
			map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringPageTotal(offset, pageSize, optimizeUse));
			return map;
			}

			@@ -213,12 +256,21 @@
			public Map<String, Object> getSelectMaterialOutbound(Integer pageNum, Integer pageSize, MaterialOutboundDetail materialOutboundDetail) {
			Integer offset = (pageNum - 1) * pageSize;
			Map<String, Object> map = new HashMap<>();
			System.out.println("数据"+materialOutboundDetail);
			map.put("materialOutbound", materialInventoryMapper.getSelectMaterialOutbound(offset, pageSize, materialOutboundDetail));
			map.put("data", materialInventoryMapper.getSelectMaterialOutboundDetail(offset, pageSize, materialOutboundDetail));
			map.put("total", materialInventoryMapper.getSelectMaterialOutboundDetailPageTotal(offset, pageSize, materialOutboundDetail));
			List<MaterialOutboundDetail> materialOutboundDetailList= materialInventoryMapper.SelectMaterialOutboundDetail(offset, pageSize, materialOutboundDetail);
			if(materialOutboundDetailList.get(0).getUseId()==null){
			map.put("materialOutbound", materialInventoryMapper.getSelectMaterialOutbound(offset, pageSize, materialOutboundDetail));
			map.put("data", materialInventoryMapper.getSelectMaterialOutboundDetail(offset, pageSize, materialOutboundDetail));
			map.put("total", materialInventoryMapper.getSelectMaterialOutboundDetailPageTotal(offset, pageSize, materialOutboundDetail));
			}else{
			map.put("materialOutbound", materialInventoryMapper.getSelectMaterialOutbound(offset, pageSize, materialOutboundDetail));
			map.put("data", materialInventoryMapper.getSelectMaterialOutboundEngineering(offset, pageSize, materialOutboundDetail));
			map.put("total", materialInventoryMapper.getSelectMaterialOutboundDetailPageTotal(offset, pageSize, materialOutboundDetail));
			}

			return map;
			}



			public Boolean updateMaterialOutboundToExamine(Map<String,Object> object) {
			boolean saveState = true;
			@@ -243,8 +295,11 @@
			List<MaterialOutboundDetail> materialOutboundDetailList = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
			if (!materialOutboundDetailList.isEmpty()) {
			for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailList) {
			//修改物料库存数量
			materialInventoryMapper.updateMaterialInventoryInventoryOut(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
			if(materialOutboundDetail.getUseId()==null){
			//修改物料库存数量
			materialInventoryMapper.updateMaterialInventoryInventoryOut(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
			}

			}
			}
			materialInventoryMapper.updateMaterialOutboundToExamine(materialOutboundId,type,reviewed);
			@@ -252,8 +307,11 @@
			List<MaterialOutboundDetail> materialOutboundDetailList = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
			if (!materialOutboundDetailList.isEmpty()) {
			for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailList) {
			//修改物料库存数量
			materialInventoryMapper.updateMaterialInventoryInventoryInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
			if(materialOutboundDetail.getUseId()==null){
			//修改物料库存数量
			materialInventoryMapper.updateMaterialInventoryInventoryInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
			}

			}
			}
			materialInventoryMapper.updateMaterialOutboundCounterExamination(materialOutboundId,type,reviewed);