~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);
			@@ -183,9 +184,9 @@
			deliverydetailsum=0;
			}

			System.out.println("订单总数:" + ordersum + "订单已发数量：" + orderDeliveryQuantitySum + "准备出库数量" +
			/*System.out.println("订单总数:" + ordersum + "订单已发数量：" + orderDeliveryQuantitySum + "准备出库数量" +
			orderDetail.getWarehouseNum()+ "发货数量" + orderDetail.getDeliveryDetail().getQuantity()+ "发货总数" +
			deliverysum+ "已发数量" + deliverydetailsum);
			deliverysum+ "已发数量" + deliverydetailsum);*/
			if (finishedGoodsInventorycount > 0) {
			if(orderDetail.getWarehouseNum()>=orderDetail.getDeliveryDetail().getQuantity()){
			//修改库存表库存数量
			@@ -607,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,"已作废");
			@@ -670,6 +671,10 @@

			}

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