~admin/ERP_override.git

			@@ -3,6 +3,7 @@
			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.example.erp.dto.mm.FinishedOperateLogDTO;
			import com.example.erp.entity.mm.FinishedGoodsInventory;
			import com.example.erp.entity.mm.FinishedOperateLog;
			import com.example.erp.entity.pp.FlowCard;
			@@ -88,7 +89,7 @@
			Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(flowCard.getOrder().getOrderId());
			Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(flowCard.getOrder().getOrderId());

			System.out.println("订单总数:" + ordersum + "已入库数量：" + ordernumbersum + "准备入库数量" + flowCard.getInventoryQuantity());
			/System.out.println("订单总数:" + ordersum + "已入库数量：" + ordernumbersum + "准备入库数量" + flowCard.getInventoryQuantity());/
			if (finishedGoodsInventorycount > 0) {
			//修改库存表入库数量
			finishedGoodsInventoryMapper.updateInventory(flowCard,storageRegion, remark);
			@@ -109,8 +110,14 @@
			finishedGoodsInventoryMapper.updateflowcard(flowCard);
			//修改订单明细表入库数量
			finishedGoodsInventoryMapper.updateIntOrderNumberConut(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),flowCard.getInventoryQuantity());
			//修改订单表入库状态
			finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),1);
			if (ordersum == (ordernumbersum + flowCard.getInventoryQuantity())) {
			//修改订单表入库状态
			finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),2);
			}else{
			//修改订单表入库状态
			finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),1);
			}


			}
			}
			@@ -167,9 +174,9 @@
			finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber);
			Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber());

			Integer finishedGoodsInventorybycount=finishedGoodsInventoryMapper.finishedGoodsInventorybycount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber());

			Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(orderDetail.getDeliveryDetail().getOrderId());
			Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(orderDetail.getDeliveryDetail().getOrderId());
			Integer orderDeliveryQuantitySum = finishedGoodsInventoryMapper.findOrderDeliveryQuantitySum(orderDetail.getDeliveryDetail().getOrderId());

			Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());
			Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);
			@@ -177,9 +184,9 @@
			deliverydetailsum=0;
			}

			System.out.println("订单总数:" + ordersum + "订单剩余数量：" + ordernumbersum + "准备出库数量" +
			/*System.out.println("订单总数:" + ordersum + "订单已发数量：" + orderDeliveryQuantitySum + "准备出库数量" +
			orderDetail.getWarehouseNum()+ "发货数量" + orderDetail.getDeliveryDetail().getQuantity()+ "发货总数" +
			deliverysum+ "已发数量" + deliverydetailsum);
			deliverysum+ "已发数量" + deliverydetailsum);*/
			if (finishedGoodsInventorycount > 0) {
			if(orderDetail.getWarehouseNum()>=orderDetail.getDeliveryDetail().getQuantity()){
			//修改库存表库存数量
			@@ -193,7 +200,7 @@
			//修改订单表发货状态
			finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
			//判断订单是否全部发货
			if (0 == (ordernumbersum - orderDetail.getWarehouseNum())) {
			if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
			//修改订单表发货状态
			finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
			}
			@@ -565,6 +572,29 @@
			return map;
			}

			public Map<String, Object> getSelectFinishedOperateLogReport(Integer pageNum, Integer pageSize, List<String> selectDate, FinishedOperateLog finishedOperateLog) {
			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", finishedOperateLogMapper.getSelectFinishedOperateLogReport(offset, pageSize,startDate, endDate, finishedOperateLog));
			map.put("total", finishedOperateLogMapper.getSelectFinishedOperateLogReportPageTotal(offset, pageSize,startDate, endDate, finishedOperateLog));
			List<String> list = new ArrayList<>();
			list.add(startDate);
			list.add(endDate);
			map.put("selectDate",list);
			return map;
			}


			public Boolean cancelFinishedGoodsInventoryStorage(Map<String,Object> object) {
			boolean saveState = true;
			@@ -578,7 +608,7 @@
			for (FinishedOperateLog finishedOperateLog : finishedOperateLogslist) {
			Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(finishedOperateLog.getOrderId());
			Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(finishedOperateLog.getOrderId());
			System.out.println(finishedOperateLog.getOperateType());

			if(Objects.equals(finishedOperateLog.getOperateType(), "入库")){
			//修改记录表
			finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"已作废");
			@@ -641,6 +671,10 @@

			}

			public List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates) {
			return finishedOperateLogMapper.exportFinishedOperateLogReport(dates);
			}